You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by rh...@apache.org on 2013/01/13 16:58:51 UTC

svn commit: r1432649 - /subversion/trunk/subversion/libsvn_subr/io.c

Author: rhuijben
Date: Sun Jan 13 15:58:51 2013
New Revision: 1432649

URL: http://svn.apache.org/viewvc?rev=1432649&view=rev
Log:
* subversion/libsvn_subr/io.c
  (svn_io_remove_file2): Also accept the ENOTDIR error as a valid error code
    to ignore for file not found, as that tells us that the parent directory
    wasn't found. This removes some filesystem implementation dependencies.

Modified:
    subversion/trunk/subversion/libsvn_subr/io.c

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1432649&r1=1432648&r2=1432649&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Sun Jan 13 15:58:51 2013
@@ -2262,7 +2262,9 @@ svn_io_remove_file2(const char *path,
 
   apr_err = apr_file_remove(path_apr, scratch_pool);
   if (!apr_err
-      || (ignore_enoent && APR_STATUS_IS_ENOENT(apr_err)))
+      || (ignore_enoent
+          && (APR_STATUS_IS_ENOENT(apr_err)
+              || SVN__APR_STATUS_IS_ENOTDIR(apr_err))))
     return SVN_NO_ERROR;
 
 #ifdef WIN32