[patch] fix macro in a gettexted string

[Andreas Stieger <an...@gmx.de>]

Hello,

I found a macro in a gettexted string which breaks the scanner.

[[[
Fix spelling error in svnadmin message and make gettext-friendly

* subversion/svnadmin/svnadmin.c
  (sub_main) fix spelling, fix macro call breaking gettext
]]]


I would like to point out that the message contains SVN_VER_PATCH as
part of SVN_VER_NUM.
"Cannot guarantee compatibility beyond the current running version (1.8.0)"
Considering the compatibility and versioning scheme used for
repositories, any repository created with 1.8.x can actually be expected
to work with any other 1.8.x. I am not sure how this lines up with the
usage of svn_version__at_least which includes SVN_VER_PATCH and
compatible_version->patch in the comparison, and the message given to
the user.

Andreas

Re: [patch] fix macro in a gettexted string

[Daniel Shahaf <d....@daniel.shahaf.name>]

Andreas Stieger wrote on Fri, Jan 18, 2013 at 15:06:04 +0000:
> Hello,
> 
> I found a macro in a gettexted string which breaks the scanner.
> 
> [[[
> Fix spelling error in svnadmin message and make gettext-friendly
> 
> * subversion/svnadmin/svnadmin.c
>   (sub_main) fix spelling, fix macro call breaking gettext

+1 to commit, with colon after the ')'.

> ]]]
> 
> 
> I would like to point out that the message contains SVN_VER_PATCH as
> part of SVN_VER_NUM.
> "Cannot guarantee compatibility beyond the current running version (1.8.0)"
> Considering the compatibility and versioning scheme used for
> repositories, any repository created with 1.8.x can actually be expected
> to work with any other 1.8.x. I am not sure how this lines up with the
> usage of svn_version__at_least which includes SVN_VER_PATCH and
> compatible_version->patch in the comparison, and the message given to
> the user.
> 

Fair point.

> Andreas
> 

> Index: subversion/svnadmin/svnadmin.c
> ===================================================================
> --- subversion/svnadmin/svnadmin.c	(revision 1435158)
> +++ subversion/svnadmin/svnadmin.c	(working copy)
> @@ -2023,9 +2023,10 @@ sub_main(int argc, const char *argv[], apr_pool_t
>                                        compatible_version->patch))
>              {
>                err = svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
> -                                      _("Cannot guaranteed compatibility "
> +                                      _("Cannot guarantee compatibility "
>                                          "beyond the current running version "
> -                                        "(" SVN_VER_NUM ")"));
> +                                        "(%s)"),
> +                                      SVN_VER_NUM );
>                return EXIT_ERROR(err);
>              }
>