Author: ivan
Date: Fri Sep 23 11:01:09 2011
New Revision: 1174652
URL: http://svn.apache.org/viewvc?rev=1174652&view=rev
Log:
Fix Windows retry loop error handling when removing file.
* subversion/libsvn_subr/io.c
(svn_io_remove_file2): Check apr_err before returning error to handle
situation when WIN32_RETRY_LOOP recovered original error.
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=1174652&r1=1174651&r2=1174652&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Fri Sep 23 11:01:09 2011
@@ -2158,8 +2158,11 @@ svn_io_remove_file2(const char *path,
}
#endif
- return svn_error_wrap_apr(apr_err, _("Can't remove file '%s'"),
- svn_dirent_local_style(path, scratch_pool));
+ if (apr_err)
+ return svn_error_wrap_apr(apr_err, _("Can't remove file '%s'"),
+ svn_dirent_local_style(path, scratch_pool));
+
+ return SVN_NO_ERROR;
}
