svn commit: r1807284 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[stefan2]

Author: stefan2
Date: Mon Sep  4 18:52:18 2017
New Revision: 1807284

URL: http://svn.apache.org/viewvc?rev=1807284&view=rev
Log:
Fix the authz error testing code in the conflict resolver.
Sometimes, the actual error gets wrapped in another.

* subversion/libsvn_client/conflicts.c
  (ignore_authz_failures): Search the whole error chain for the relevant
                           authz failure codes.

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

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1807284&r1=1807283&r2=1807284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Sep  4 18:52:18 
2017
@@ -9718,9 +9718,9 @@ svn_client_conflict_tree_get_resolution_
 static svn_error_t *
 ignore_authz_failures(svn_error_t *err)
 {
-  if (err && (   (err->apr_err == SVN_ERR_AUTHZ_UNREADABLE)
-              || (err->apr_err == SVN_ERR_RA_NOT_AUTHORIZED)
-              || (err->apr_err == SVN_ERR_RA_DAV_FORBIDDEN)))
+  if (err && (   svn_error_find_cause(err, SVN_ERR_AUTHZ_UNREADABLE)
+              || svn_error_find_cause(err, SVN_ERR_RA_NOT_AUTHORIZED)
+              || svn_error_find_cause(err, SVN_ERR_RA_DAV_FORBIDDEN)))
     {
       svn_error_clear(err);
       err = SVN_NO_ERROR;