From 0d6728f9cf142367885a95e3f19e65cf0b19a7e0 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 30 Nov 2015 18:57:48 -0800 Subject: [PATCH] Punctuation and deprecation --- letsencrypt-apache/letsencrypt_apache/configurator.py | 4 +--- letsencrypt/le_util.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 1849c0095..fa12ccf03 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -95,13 +95,11 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): help="Path to the Apache 'a2enmod' binary.") add("dismod", default=constants.CLI_DEFAULTS["dismod"], help="Path to the Apache 'a2enmod' binary.") - add("init-script", default=constants.CLI_DEFAULTS["init_script"], - help="Path to the Apache init script (used for server " - "reload).") add("le-vhost-ext", default=constants.CLI_DEFAULTS["le_vhost_ext"], help="SSL vhost configuration extension.") add("server-root", default=constants.CLI_DEFAULTS["server_root"], help="Apache server root directory.") + le_util.add_deprecated_argument(add, "init-script", 1) def __init__(self, *args, **kwargs): """Initialize an Apache Configurator. diff --git a/letsencrypt/le_util.py b/letsencrypt/le_util.py index d127c9d64..7869fc9a5 100644 --- a/letsencrypt/le_util.py +++ b/letsencrypt/le_util.py @@ -276,7 +276,7 @@ def add_deprecated_argument(add_argument, argument_name, nargs): """Action to log a warning when an argument is used.""" def __call__(self, unused1, unused2, unused3, option_string=None): sys.stderr.write( - "Use of {0} is deprecated\n".format(option_string)) + "Use of {0} is deprecated.\n".format(option_string)) add_argument(argument_name, action=ShowWarning, help=argparse.SUPPRESS, nargs=nargs)