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

RE: svn commit: r38053 - trunk/subversion/libsvn_subr

From: Bert Huijben <rhuijben_at_sharpsvn.net>
Date: Wed, 17 Jun 2009 17:52:33 +0200

Hi Stefan,

> -----Original Message-----
> From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
> Sent: woensdag 17 juni 2009 17:30
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r38053 - trunk/subversion/libsvn_subr
>
> Author: steveking
> Date: Wed Jun 17 08:29:53 2009
> New Revision: 38053
>
> Log:
> Do not bail if the ALLUSERPROFILE folder does not exist.
> * subversion/libsvn_subr/config.c
> (get_category_config): handle the error gracefully.
> * subversion/libsvn_subr/config_file.c
> (svn_config__sys_config_path): remove wrong comment.
>
> Modified:
> trunk/subversion/libsvn_subr/config.c
> trunk/subversion/libsvn_subr/config_file.c
>
> Modified: trunk/subversion/libsvn_subr/config.c
> URL:
>
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/config.c?pathr
ev
> =38053&r1=38052&r2=38053
>
============================================================================
==
> --- trunk/subversion/libsvn_subr/config.c Wed Jun 17 06:24:43 2009
> (r38052)
> +++ trunk/subversion/libsvn_subr/config.c Wed Jun 17 08:29:53 2009
> (r38053)
> @@ -198,6 +198,7 @@ get_category_config(svn_config_t **cfg,
> {
> const char *usr_reg_path = NULL, *sys_reg_path = NULL;
> const char *usr_cfg_path, *sys_cfg_path;
> + svn_error_t *err = NULL;

You define err here
>
> *cfg = NULL;
>
> @@ -210,7 +211,14 @@ get_category_config(svn_config_t **cfg,
> category, NULL);
> #endif /* WIN32 */
>
> - SVN_ERR(svn_config__sys_config_path(&sys_cfg_path, category,
pool));
> + error = svn_config__sys_config_path(&sys_cfg_path, category, pool);

And use error here.

(See the buildbots: http://crest.ics.uci.edu/buildbot/waterfall)

        Bert

> + if ((err) && (err->apr_err == SVN_ERR_BAD_FILENAME))
> + {
> + sys_cfg_path = NULL;
> + svn_error_clear(err);
> + }
> + else
> + return err;
> }
> else
> sys_cfg_path = NULL;
>
> Modified: trunk/subversion/libsvn_subr/config_file.c
> URL:
>
http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_subr/config_file.c?
pa
> threv=38053&r1=38052&r2=38053
>
============================================================================
==
> --- trunk/subversion/libsvn_subr/config_file.c Wed Jun 17 06:24:43
2009
> (r38052)
> +++ trunk/subversion/libsvn_subr/config_file.c Wed Jun 17 08:29:53
2009
> (r38053)
> @@ -314,9 +314,6 @@ svn_config__sys_config_path(const char *
> const char *fname,
> apr_pool_t *pool)
> {
> - /* ### This never actually returns error in practice. Perhaps the
> - prototype should change? */
> -
> *path_p = NULL;
>
> /* Note that even if fname is null, svn_dirent_join_many will DTRT. */
>
> ------------------------------------------------------
>
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=236
28
> 51

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2362862
Received on 2009-06-17 17:52:53 CEST

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