subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1357571 - /subversion/trunk/subversion/svn/export-cmd.c
Date Thu, 05 Jul 2012 12:12:23 GMT
Author: stsp
Date: Thu Jul  5 12:12:23 2012
New Revision: 1357571

URL: http://svn.apache.org/viewvc?rev=1357571&view=rev
Log:
* subversion/svn/export-cmd.c
  (svn_cl__export): Don't leak 'err' if an externals error occurred and
   'err' is not SVN_ERR_WC_OBSTRUCTED_UPDATE.


Modified:
    subversion/trunk/subversion/svn/export-cmd.c

Modified: subversion/trunk/subversion/svn/export-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/export-cmd.c?rev=1357571&r1=1357570&r2=1357571&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/export-cmd.c (original)
+++ subversion/trunk/subversion/svn/export-cmd.c Thu Jul  5 12:12:23 2012
@@ -114,9 +114,15 @@ svn_cl__export(apr_getopt_t *os,
                 "the directory or use --force to overwrite"));
 
   if (nwb.had_externals_error)
-    return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
-                            _("Failure occurred processing one or more "
-                              "externals definitions"));
+    {
+      svn_error_t *externals_err;
+
+      externals_err = svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS,
+                                       NULL,
+                                       _("Failure occurred processing one or "
+                                         "more externals definitions"));
+      return svn_error_compose_create(externals_err, err);
+    }
 
   return svn_error_trace(err);
 }



Mime
View raw message