svn commit: r983862 - /subversion/trunk/subversion/svnsync/main.c

[da...@apache.org]

Author: danielsh
Date: Tue Aug 10 05:44:04 2010
New Revision: 983862

URL: http://svn.apache.org/viewvc?rev=983862&view=rev
Log:
* subversion/svnsync/main.c
  (with_locked):  Don't swallow one error when two occurred.

Modified:
    subversion/trunk/subversion/svnsync/main.c

Modified: subversion/trunk/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/main.c?rev=983862&r1=983861&r2=983862&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/main.c (original)
+++ subversion/trunk/subversion/svnsync/main.c Tue Aug 10 05:44:04 2010
@@ -387,20 +387,8 @@ with_locked(svn_ra_session_t *session,
   err = func(session, baton, pool);
 
   err2 = svn_ra_change_rev_prop(session, 0, SVNSYNC_PROP_LOCK, NULL, pool);
-  if (err2 && err)
-    {
-      svn_error_clear(err2); /* XXX what to do here? */
 
-      return err;
-    }
-  else if (err2)
-    {
-      return err2;
-    }
-  else
-    {
-      return err;
-    }
+  return svn_error_compose_create(err, svn_error_return(err2));
 }