You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/03/30 16:35:04 UTC
Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
On Mon, Mar 30, 2009 at 16:41, Kamesh Jayachandran <ka...@collab.net> wrote:
>...
> +++ trunk/subversion/libsvn_fs_base/fs.c Mon Mar 30 07:41:13 2009 (r36851)
> @@ -819,12 +819,18 @@ base_upgrade(svn_fs_t *fs, const char *p
> {
> const char *version_file_path;
> int old_format_number;
> + svn_error_t *err;
>
> version_file_path = svn_path_join(path, FORMAT_FILE, pool);
>
> /* Read the old number so we've got it on hand later on. */
> - SVN_ERR(svn_io_read_version_file(&old_format_number, version_file_path,
> - pool));
> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
> + if (APR_STATUS_IS_ENOENT(err->apr_err))
Hmm? And won't this fail miserably when err == NULL ?
>...
Cheers,
-g
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1483686
RE: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by Kamesh Jayachandran <ka...@collab.net>.
>On Mon, Mar 30, 2009 at 16:41, Kamesh Jayachandran <ka...@collab.net> wrote:
>>...
>> +++ trunk/subversion/libsvn_fs_base/fs.c Mon Mar 30 07:41:13 2009 (r36851)
>> @@ -819,12 +819,18 @@ base_upgrade(svn_fs_t *fs, const char *p
>> {
>> const char *version_file_path;
>> int old_format_number;
>> + svn_error_t *err;
>>
>> version_file_path = svn_path_join(path, FORMAT_FILE, pool);
>>
>> /* Read the old number so we've got it on hand later on. */
>> - SVN_ERR(svn_io_read_version_file(&old_format_number, version_file_path,
>> - pool));
>> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
>> + if (APR_STATUS_IS_ENOENT(err->apr_err))
>Hmm? And won't this fail miserably when err == NULL ?
Yes. I ran through the full testsuite over ra_local, No failures found, I realise we do not have any 'svnadmin upgrade' test.
With regards
Kamesh Jayachandran
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1484589
Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by Greg Stein <gs...@gmail.com>.
On Mon, Mar 30, 2009 at 21:35, Stefan Sperling <st...@elego.de> wrote:
> On Mon, Mar 30, 2009 at 01:16:30PM -0400, C. Michael Pilato wrote:
>> Greg Stein wrote:
>> >> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
>> >> + if (APR_STATUS_IS_ENOENT(err->apr_err))
>> >
>> > Hmm? And won't this fail miserably when err == NULL ?
>>
>> Yup.
>
> Whooops! Thanks for catching.
Grumpy me says, "not a hard one to catch"
:-(
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1486301
Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by Stefan Sperling <st...@elego.de>.
On Mon, Mar 30, 2009 at 01:16:30PM -0400, C. Michael Pilato wrote:
> Greg Stein wrote:
> >> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
> >> + if (APR_STATUS_IS_ENOENT(err->apr_err))
> >
> > Hmm? And won't this fail miserably when err == NULL ?
>
> Yup.
Whooops! Thanks for catching.
Stefan
RE: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by Kamesh Jayachandran <ka...@collab.net>.
Thanks Mike, for taking care of this.
With regards
Kamesh Jayachandran
-----Original Message-----
From: C. Michael Pilato [mailto:cmpilato@collab.net]
Sent: Mon 3/30/2009 10:52 PM
To: Greg Stein
Cc: dev@subversion.tigris.org
Subject: Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
C. Michael Pilato wrote:
> Greg Stein wrote:
>>> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
>>> + if (APR_STATUS_IS_ENOENT(err->apr_err))
>> Hmm? And won't this fail miserably when err == NULL ?
>
> Yup.
Fixed in r36857.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1484030
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1484560
Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by "C. Michael Pilato" <cm...@collab.net>.
C. Michael Pilato wrote:
> Greg Stein wrote:
>>> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
>>> + if (APR_STATUS_IS_ENOENT(err->apr_err))
>> Hmm? And won't this fail miserably when err == NULL ?
>
> Yup.
Fixed in r36857.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1484030
Re: svn commit: r36851 - trunk/subversion/libsvn_fs_base
Posted by "C. Michael Pilato" <cm...@collab.net>.
Greg Stein wrote:
>> + err = svn_io_read_version_file(&old_format_number, version_file_path, pool);
>> + if (APR_STATUS_IS_ENOENT(err->apr_err))
>
> Hmm? And won't this fail miserably when err == NULL ?
Yup.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1483979