Re: svn commit: r13182 - in trunk/subversion: clients/cmdline include libsvn_subr svnadmin svndumpfilter svnlook svnserve

[kf...@collab.net]

dionisos@tigris.org writes:
> --- trunk/subversion/svnserve/main.c	(original)
> +++ trunk/subversion/svnserve/main.c	Sun Feb 27 15:43:31 2005
> @@ -328,16 +339,18 @@
>  
>          case 'R':
>            params.read_only = TRUE;
> +          /* Don't translate the warning below: we may stay in
> +             server mode (and thus don't want to translate messages) */
>            svn_error_clear
>              (svn_cmdline_fprintf
>                 (stderr, pool,
> -                _("Warning: -R is deprecated.\n"
> -                  "Anonymous access is now read-only by default.\n"
> -                  "To change, use conf/svnserve.conf in repos:\n"
> -                  "  [general]\n"
> -                  "  anon-access = read|write|none (default read)\n"
> -                  "  auth-access = read|write|none (default write)\n"
> -                  "Forcing all access to read-only for now\n")));
> +                "Warning: -R is deprecated.\n"
> +                "Anonymous access is now read-only by default.\n"
> +                "To change, use conf/svnserve.conf in repos:\n"
> +                "  [general]\n"
> +                "  anon-access = read|write|none (default read)\n"
> +                "  auth-access = read|write|none (default write)\n"
> +                "Forcing all access to read-only for now\n"));
>            break;
>  
>          case 'T':

If we're going to leave messages untranslated (because they might be
sent to the client), it would probably be a good idea to have a
comment indicating that.  Otherwise, someone may come along in the
future and add back the "_()", not realizing that the lack of
translation is deliberate.

> @@ -386,10 +401,8 @@
>  #endif
>    if (status)
>      {
> -      svn_error_clear
> -        (svn_cmdline_fprintf
> -           (stderr, pool, _("Can't create server socket: %s\n"),
> -            apr_strerror(status, errbuf, sizeof(errbuf))));
> +      fprintf (stderr, "Can't create server socket: %s\n",
> +               apr_strerror(status, errbuf, sizeof(errbuf)));
>        exit(1);
>      }

Ditto.

> @@ -400,32 +413,20 @@
>    status = apr_sockaddr_info_get(&sa, host, APR_INET, port, 0, pool);
>    if (status)
>      {
> -      svn_error_clear
> -        (svn_cmdline_fprintf
> -           (stderr, pool, _("Can't get address info: %s\n"),
> -            apr_strerror(status, errbuf, sizeof(errbuf))));
> +      fprintf (stderr, "Can't get address info: %s\n",
> +               apr_strerror(status, errbuf, sizeof(errbuf)));
>        exit(1);
>      }

Ditto.

>    status = apr_socket_bind(sock, sa);
>    if (status)
>      {
> -      svn_error_clear
> -        (svn_cmdline_fprintf
> -           (stderr, pool, _("Can't bind server socket: %s\n"),
> -            apr_strerror(status, errbuf, sizeof(errbuf))));
> +      fprintf (stderr, "Can't bind server socket: %s\n",
> +               apr_strerror(status, errbuf, sizeof(errbuf)));
>        exit(1);
>      }

Ditto.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org