svn commit: r1600393 - /subversion/trunk/subversion/libsvn_client/externals.c

[rhuijben]

Author: rhuijben
Date: Wed Jun  4 17:46:04 2014
New Revision: 1600393

URL: http://svn.apache.org/r1600393
Log:
* subversion/libsvn_client/externals.c
  (svn_client__handle_externals): Following up on r1600323, handle a few more
    possible error codes that note that we didn't find a directory to delete.

Modified:
    subversion/trunk/subversion/libsvn_client/externals.c

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1600393&r1=1600392&r2=1600393&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Wed Jun  4 17:46:04 
2014
@@ -1025,18 +1025,22 @@ svn_client__handle_externals(apr_hash_t 
             svn_error_t *err;
 
             err = svn_io_dir_remove_nonrecursive(parent_abspath, iterpool);
-            if (err && APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+            if (err)
               {
-                svn_error_clear(err);
-                break; /* No parents to delete */
+                if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+                  {
+                    svn_error_clear(err);
+                    break; /* No parents to delete */
+                  }
+                else if (APR_STATUS_IS_ENOENT(err->apr_err)
+                         || APR_STATUS_IS_ENOTDIR(err->apr_err))
+                  {
+                    svn_error_clear(err);
+                    /* Fall through; parent dir might be unversioned */
+                  }
+                else
+                  return svn_error_trace(err);
               }
-            else if (err && APR_STATUS_IS_ENOTDIR(err->apr_err))
-              {
-                svn_error_clear(err);
-                /* Fall through; parent dir might be unversioned */
-              }
-            else
-              SVN_ERR(err);
           }
       } while (strcmp(parent_abspath, defining_abspath) != 0);
     }