[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r15423 - in trunk/subversion: libsvn_ra_dav

From: <kfogel_at_collab.net>
Date: 2005-07-26 01:38:46 CEST

sussman@tigris.org writes:
> --- trunk/subversion/libsvn_ra_dav/fetch.c (original)
> +++ trunk/subversion/libsvn_ra_dav/fetch.c Mon Jul 25 10:32:37 2005
> @@ -1634,23 +1634,33 @@
> ### info itself? */
> err = svn_ra_dav__maybe_store_auth_info_after_result(err, ras);
>
> + /* At this point, 'err' might represent a local error (neon choked,
> + or maybe something went wrong storing auth creds). But if
> + 'baton.err' exists, that's an error coming right from the server,
> + marshalled over the network. We give that top priority. */
> if (baton.err)
> {
> if (err)
> svn_error_clear(err);
>
> + /* mod_dav_svn is known to return "unsupported feature" on
> + unknown REPORT requests, but it's our svn_ra.h promise to
> + return a similar, specific error code. */
> + if (baton.err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
> + return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, baton.err,
> + _("Server does not support locking features"));
> return baton.err;
> }
>
> /* Map status 501: Method Not Implemented to our not implemented error.
> 1.0.x servers and older don't support this report. */
> if (status_code == 501)
> - return svn_error_create (SVN_ERR_RA_NOT_IMPLEMENTED, err,
> - _("Server does not support locking features"));
> + return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, err,
> + _("Server does not support locking features"));
>
> if (err && err->apr_err == SVN_ERR_UNSUPPORTED_FEATURE)
> - return svn_error_quick_wrap(err,
> - _("Server does not support locking features"));
> + return svn_error_create(SVN_ERR_RA_NOT_IMPLEMENTED, err,
> + _("Server does not support locking features"));
>
> else if (err)
> return err;

It looks like part of this (in the 501 trap code) is just a formatting
fix -- you removed a space before a paren. I guess ideally that
formatting fix would be its own commit, but if it's going to be part
of this commit, at least mention it in the log message, so the reader
knows to expect it.

Nice change otherwise!

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 26 02:31:13 2005

This is an archived mail posted to the Subversion Dev mailing list.