On Mon, Aug 02, 2010 at 10:10:18AM -0500, Peter Samuelson wrote:
>
> [stsp_at_apache.org]
> > + switch (kind)
> > + {
> > + case svn_node_none:
> > + SVN_ERR(write_config(fs, pool));
> > + break;
> > + case svn_node_dir:
> > + return svn_error_return(svn_error_createf(SVN_ERR_FS_GENERAL, NULL,
> > + _("'%s' is a directory. "
> > + "Please move it out of "
> > + "the way and try again"),
> > + svn_dirent_join(fs->path,
> > + PATH_CONFIG,
> > + pool)));
> > + default:
> > + break;
> > + }
>
> I don't think this customized error message is worth it. When would
> fsfs.conf _ever_ be a directory? It could only happen due to an
> explicit and unwise action of the administrator - likely the same
> person running the 'hotcopy'. (And indeed, they probably only did it
> to see if they could break svnadmin.) This admin could surely figure
> out the other error, which would be something like "Cannot open
> .../fsfs.conf: is a directory".
The original error that was thrown when fsfs.conf is a directory
wasn't saying "is a directory", it was saying "file exists".
Which is pretty weird.
> I'm not just worried about the extra code; there's also the extra
> string to translate. I just don't think anyone needs it.
In trunk, it now says "fsfs.conf is not a regular file".
See r981201.
I didn't bother backporting that change to 1.6.x as well.
But if you prefer the trunk version, I can add it to the backport.
Stefan
Received on 2010-08-02 17:35:36 CEST