svn commit: r1174665 - /subversion/branches/1.7.x/subversion/libsvn_subr/io.c

[ivan]

Author: ivan
Date: Fri Sep 23 11:21:17 2011
New Revision: 1174665

URL: http://svn.apache.org/viewvc?rev=1174665&view=rev
Log:
* STATUS: Propose r1174652 for backport.

Modified:
    subversion/branches/1.7.x/subversion/libsvn_subr/io.c

Modified: subversion/branches/1.7.x/subversion/libsvn_subr/io.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_subr/io.c?rev=1174665&r1=1174664&r2=1174665&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_subr/io.c Fri Sep 23 11:21:17 
2011
@@ -2151,8 +2151,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;
 }