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

Re: svn commit: r22940 - in trunk/subversion: include libsvn_client libsvn_wc svn tests/cmdline

From: Ivan Zhakov <chemodax_at_gmail.com>
Date: 2007-01-09 21:24:32 CET

On 1/9/07, Malcolm Rowe <malcolm-svn-dev@farside.org.uk> wrote:
> On Tue, Jan 09, 2007 at 03:09:35PM +0300, Ivan Zhakov wrote:
> > Buildbot fails on MacOS and Debian shared, but works on Windows after
> > my commit. I cannot understand why, because it works on my Mac OS
> > machine, but with --disable-shared.
> >
>
> I don't know why it works on your machine.
>
> In svn_wc__check_killme(), if the killme file doesn't exist, you ignore
> the error from svn_stringbuf_from_file but leave (svn_stringbuf_t*)
> contents uninitialised.
Oops. Thanks for catching this bug. I'll fix it.

>
> Index: subversion/libsvn_wc/adm_files.c
> ===================================================================
> --- subversion/libsvn_wc/adm_files.c (revision 22940)
> +++ subversion/libsvn_wc/adm_files.c (working copy)
> @@ -296,22 +296,22 @@
>
> path = extend_with_adm_name(svn_wc_adm_access_path(adm_access),
> NULL, FALSE, pool, SVN_WC__ADM_KILLME, NULL);
> -
> - /* By default think that killme file exists. */
> - *exists = TRUE;
> err = svn_stringbuf_from_file(&contents, path, pool);
>
> - if (err && APR_STATUS_IS_ENOENT(err->apr_err))
> + if (err)
> {
> - /* Killme file doesn't exist. */
> - *exists = FALSE;
> - svn_error_clear(err);
> - }
> - else if (err)
> - {
> + if (APR_STATUS_IS_ENOENT(err->apr_err))
> + {
> + /* Killme file doesn't exist. */
> + svn_error_clear(err);
> + *exists = FALSE;
> + return SVN_NO_ERROR;
> + }
> +
> return err;
> }
>
> + *exists = TRUE;
> /* If killme file contains string 'adm-only' then remove only administrative
> area. */
> *kill_adm_only = svn_string_compare_stringbuf
>
>
>
>

-- 
Ivan Zhakov
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jan 9 21:24:41 2007

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