From f6c02728e4348a88fbca2acbacb2a8b55315b772 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Fri, 28 Apr 2017 18:37:58 -0700 Subject: [PATCH] Address review comments --- certbot/cli.py | 3 +-- certbot/client.py | 7 +------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/certbot/cli.py b/certbot/cli.py index 82c9622f0..9e8778ceb 100644 --- a/certbot/cli.py +++ b/certbot/cli.py @@ -532,7 +532,6 @@ class HelpfulArgumentParser(object): parsed_args = self.parser.parse_args(self.args) parsed_args.func = self.VERBS[self.verb] parsed_args.verb = self.verb - parsed_args.renewing = "unknown" # used for the User Agent; not known until later if self.detect_defaults: return parsed_args @@ -1106,7 +1105,7 @@ def _create_subparsers(helpful): help="Set a custom user agent string for the client. User agent strings allow " "the CA to collect high level statistics about success rates by OS, " "plugin and use case, and to know when to deprecate support for past Python " - "versions. If you wish to hide this information from the Let's " + "versions and flags. If you wish to hide this information from the Let's " 'Encrypt server, set this to "". ' '(default: {0}). The flags encoded in the user agent are: ' '--duplicate, --force-renew, --allow-subset-of-names, -n, and ' diff --git a/certbot/client.py b/certbot/client.py index ad7323e62..dca6d8618 100644 --- a/certbot/client.py +++ b/certbot/client.py @@ -54,14 +54,9 @@ def determine_user_agent(config): """ if config.user_agent is None: - if cli.cli_command in ["certbot", "letsencrypt", "certbot-auto", "letsencrypt-auto"]: - auto = cli.cli_command - else: - auto = "other" - ua = ("CertbotACMEClient/{0} ({1}; {2}) Authenticator/{3} Installer/{4} " "({5}; flags: {6}) Py/{7}") - ua = ua.format(certbot.__version__, auto, util.get_os_info_ua(), + ua = ua.format(certbot.__version__, cli.cli_command, util.get_os_info_ua(), config.authenticator, config.installer, config.verb, ua_flags(config), platform.python_version()) else: