From 8a5d40fc35fdaee47436271d1a7b760182df0393 Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 9 Feb 2016 15:41:42 -0800 Subject: [PATCH 1/2] Make add_deprecated_argument more readable --- letsencrypt-apache/letsencrypt_apache/configurator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 0ab16ff06..c61980f01 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -106,7 +106,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): add("handle-sites", default=constants.os_constant("handle_sites"), help="Let installer handle enabling sites for you." + "(Only Ubuntu/Debian currently)") - le_util.add_deprecated_argument(add, "init-script", 1) + le_util.add_deprecated_argument( + add, argument_name="init-script", nargs=1) def __init__(self, *args, **kwargs): """Initialize an Apache Configurator. From 8f283924cd8f672a6593a2276cc011403d036aaa Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Tue, 9 Feb 2016 15:43:51 -0800 Subject: [PATCH 2/2] Add --apache-ctl as deprecated arg --- letsencrypt-apache/letsencrypt_apache/configurator.py | 1 + 1 file changed, 1 insertion(+) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index c61980f01..cbc451ac9 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -106,6 +106,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): add("handle-sites", default=constants.os_constant("handle_sites"), help="Let installer handle enabling sites for you." + "(Only Ubuntu/Debian currently)") + le_util.add_deprecated_argument(add, argument_name="ctl", nargs=1) le_util.add_deprecated_argument( add, argument_name="init-script", nargs=1)