diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2018-05-08 03:44:38 +0000 |
| commit | 3faf8d6bffc5d0fb2525ba37bb504c53366caf9d (patch) | |
| tree | 7e47911263e75034b767fe34b2f8d3d17e91f66d /subversion/libsvn_ra_serf/lock.c | |
| parent | a55fb3c0d5eca7d887798125d5b95942b1f01d4b (diff) | |
| download | src-3faf8d6bffc5d0fb2525ba37bb504c53366caf9d.tar.gz src-3faf8d6bffc5d0fb2525ba37bb504c53366caf9d.zip | |
Import Subversion-1.10.0vendor/subversion/subversion-1.10.0
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=333347
svn path=/vendor/subversion/subversion-1.10.0/; revision=333348; tag=vendor/subversion/subversion-1.10.0
Diffstat (limited to 'subversion/libsvn_ra_serf/lock.c')
| -rw-r--r-- | subversion/libsvn_ra_serf/lock.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/subversion/libsvn_ra_serf/lock.c b/subversion/libsvn_ra_serf/lock.c index dd045e3a1751..d303104b3684 100644 --- a/subversion/libsvn_ra_serf/lock.c +++ b/subversion/libsvn_ra_serf/lock.c @@ -267,10 +267,9 @@ run_locks(svn_ra_serf__session_t *sess, /* ### Authz can also lead to 403. */ err = svn_error_createf(SVN_ERR_FS_LOCK_OWNER_MISMATCH, NULL, - _("Unlock of '%s' failed (%d %s)"), - ctx->path, - ctx->handler->sline.code, - ctx->handler->sline.reason); + _("Not authorized to perform lock " + "operation on '%s'"), + ctx->path); break; case 405: err = svn_error_createf(SVN_ERR_FS_OUT_OF_DATE, @@ -282,13 +281,20 @@ run_locks(svn_ra_serf__session_t *sess, ctx->handler->sline.reason); break; case 423: - err = svn_error_createf(SVN_ERR_FS_PATH_ALREADY_LOCKED, - NULL, - _("Path '%s' already locked " - "(%d %s)"), - ctx->path, - ctx->handler->sline.code, - ctx->handler->sline.reason); + if (server_err + && SVN_ERROR_IN_CATEGORY(server_err->apr_err, + SVN_ERR_FS_CATEGORY_START)) + { + err = NULL; + } + else + err = svn_error_createf(SVN_ERR_FS_PATH_ALREADY_LOCKED, + NULL, + _("Path '%s' already locked " + "(%d %s)"), + ctx->path, + ctx->handler->sline.code, + ctx->handler->sline.reason); break; case 404: |