You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Philip Martin <ph...@wandisco.com> on 2015/05/11 18:32:54 UTC

Re: svn commit: r1678734 - in /subversion/trunk/subversion: include/private/ libsvn_subr/ svn/ svnbench/ svnmucc/ svnrdump/ svnsync/ tests/cmdline/getopt_tests_data/

rhuijben@apache.org writes:

> Author: rhuijben
> Date: Mon May 11 11:56:46 2015
> New Revision: 1678734

> +svn_error_t *
> +svn_cmdline__parse_trust_options(
> +                        svn_boolean_t *trust_server_cert_unknown_ca,
> +                        svn_boolean_t *trust_server_cert_cn_mismatch,
> +                        svn_boolean_t *trust_server_cert_expired,
> +                        svn_boolean_t *trust_server_cert_not_yet_valid,
> +                        svn_boolean_t *trust_server_cert_other_failure,
> +                        const char *opt_arg,
> +                        const char *error_prefix,
> +                        apr_pool_t *scratch_pool)

> +        return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
> +                                  _("%sUnknown value '%s' for %s.\n"
> +                                    "Supported values: %s"),
> +                                  error_prefix ? error_prefix : "",
> +                                  value,
> +                                  "--trust-server-cert-failures",
> +                                  "unknown-ca, cn-mismatch, expired, "
> +                                  "not-yet-valid, other");

Why are you using error_prefix here?  We don't usually do that.  It
leads to output like "svn: E205000: svn:" with duplicate "svn:"

$ svn ls --trust-server-cert-failures foo --non-interactive
svn: E205000: svn: Unknown value 'foo' for --trust-server-cert-failures.
Supported values: unknown-ca, cn-mismatch, expired, not-yet-valid, other


-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*

Re: svn commit: r1678734 - in /subversion/trunk/subversion:include/private/ libsvn_subr/ svn/ svnbench/ svnmucc/ svnrdump/ svnsync/tests/cmdline/getopt_tests_data/

Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Bert Huijben wrote on Mon, May 11, 2015 at 19:13:33 +0200:
> Hmm. I think I copied that from some code that uses it for showing warnings. (The config options parse function)
> 

The --config-option parser needs 'prefix' because it calls
svn_handle_warning2().  You just call svn_error_create() so you don't
need a 'prefix' function.

Daniel

> Bert
> 
> -----Original Message-----
> From: "Philip Martin" <ph...@wandisco.com>
> Sent: ‎11-‎5-‎2015 18:33
> To: "rhuijben@apache.org" <rh...@apache.org>
> Cc: "dev@subversion.apache.org" <de...@subversion.apache.org>
> Subject: Re: svn commit: r1678734 - in /subversion/trunk/subversion:include/private/ libsvn_subr/ svn/ svnbench/ svnmucc/ svnrdump/ svnsync/tests/cmdline/getopt_tests_data/
> 
> rhuijben@apache.org writes:
> 
> > Author: rhuijben
> > Date: Mon May 11 11:56:46 2015
> > New Revision: 1678734
> 
> > +svn_error_t *
> > +svn_cmdline__parse_trust_options(
> > +                        svn_boolean_t *trust_server_cert_unknown_ca,
> > +                        svn_boolean_t *trust_server_cert_cn_mismatch,
> > +                        svn_boolean_t *trust_server_cert_expired,
> > +                        svn_boolean_t *trust_server_cert_not_yet_valid,
> > +                        svn_boolean_t *trust_server_cert_other_failure,
> > +                        const char *opt_arg,
> > +                        const char *error_prefix,
> > +                        apr_pool_t *scratch_pool)
> 
> > +        return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
> > +                                  _("%sUnknown value '%s' for %s.\n"
> > +                                    "Supported values: %s"),
> > +                                  error_prefix ? error_prefix : "",
> > +                                  value,
> > +                                  "--trust-server-cert-failures",
> > +                                  "unknown-ca, cn-mismatch, expired, "
> > +                                  "not-yet-valid, other");
> 
> Why are you using error_prefix here?  We don't usually do that.  It
> leads to output like "svn: E205000: svn:" with duplicate "svn:"
> 
> $ svn ls --trust-server-cert-failures foo --non-interactive
> svn: E205000: svn: Unknown value 'foo' for --trust-server-cert-failures.
> Supported values: unknown-ca, cn-mismatch, expired, not-yet-valid, other
> 
> 
> -- 
> Philip Martin | Subversion Committer
> WANdisco // *Non-Stop Data*

RE: svn commit: r1678734 - in /subversion/trunk/subversion:include/private/ libsvn_subr/ svn/ svnbench/ svnmucc/ svnrdump/ svnsync/tests/cmdline/getopt_tests_data/

Posted by Bert Huijben <be...@qqmail.nl>.
Hmm. I think I copied that from some code that uses it for showing warnings. (The config options parse function)

Bert

-----Original Message-----
From: "Philip Martin" <ph...@wandisco.com>
Sent: ‎11-‎5-‎2015 18:33
To: "rhuijben@apache.org" <rh...@apache.org>
Cc: "dev@subversion.apache.org" <de...@subversion.apache.org>
Subject: Re: svn commit: r1678734 - in /subversion/trunk/subversion:include/private/ libsvn_subr/ svn/ svnbench/ svnmucc/ svnrdump/ svnsync/tests/cmdline/getopt_tests_data/

rhuijben@apache.org writes:

> Author: rhuijben
> Date: Mon May 11 11:56:46 2015
> New Revision: 1678734

> +svn_error_t *
> +svn_cmdline__parse_trust_options(
> +                        svn_boolean_t *trust_server_cert_unknown_ca,
> +                        svn_boolean_t *trust_server_cert_cn_mismatch,
> +                        svn_boolean_t *trust_server_cert_expired,
> +                        svn_boolean_t *trust_server_cert_not_yet_valid,
> +                        svn_boolean_t *trust_server_cert_other_failure,
> +                        const char *opt_arg,
> +                        const char *error_prefix,
> +                        apr_pool_t *scratch_pool)

> +        return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
> +                                  _("%sUnknown value '%s' for %s.\n"
> +                                    "Supported values: %s"),
> +                                  error_prefix ? error_prefix : "",
> +                                  value,
> +                                  "--trust-server-cert-failures",
> +                                  "unknown-ca, cn-mismatch, expired, "
> +                                  "not-yet-valid, other");

Why are you using error_prefix here?  We don't usually do that.  It
leads to output like "svn: E205000: svn:" with duplicate "svn:"

$ svn ls --trust-server-cert-failures foo --non-interactive
svn: E205000: svn: Unknown value 'foo' for --trust-server-cert-failures.
Supported values: unknown-ca, cn-mismatch, expired, not-yet-valid, other


-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*