upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-03-23 19:03:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix bugs, clean up plumbing.

Browse source
This commit is contained in:
Peter Eckersley 2016-02-08 16:59:11 -08:00
parent 994c96180a
commit bcf38476fa
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
letsencrypt/cli.py
View file

@ -744,8 +744,8 @@ def _set_by_cli(var):
plugins = plugins_disco.PluginsRegistry.find_all()
# reconstructed_args == sys.argv[1:], or whatever was passed to main()
reconstructed_args = _parser.args + [_parser.verb]
default_args = prepare_and_parse_args(plugins, reconstructed_args, detect_defaults=True)
_set_by_cli.detector = configuration.NamespaceConfig(default_args, fake=True)
_set_by_cli.detector = prepare_and_parse_args(plugins, reconstructed_args,
detect_defaults=True)
try:
# Is detector.var something that isn't false?
@ -758,7 +758,7 @@ def _set_by_cli(var):
return True
# Special case: vars like --no-redirect that get set True -> False
# default to None; False means they were set
elif var in _set_by_cli.detector.namespace.store_false_vars and change_detected is not None:
elif var in _set_by_cli.detector.store_false_vars and change_detected is not None:
return True
else:
return False
@ -1154,6 +1154,9 @@ class HelpfulArgumentParser(object):
raise errors.Error("--dry-run currently only works with the "
"'certonly' or 'renew' subcommands (%r)" % self.verb)
parsed_args.break_my_certs = parsed_args.staging = True
if self.detect_defaults: # plumbing
parsed_args.store_false_vars = self.store_false_vars
return parsed_args
@ -1476,8 +1479,9 @@ def prepare_and_parse_args(plugins, args, detect_defaults=False):
# parser (--help should display plugin-specific options last)
_plugins_parsing(helpful, plugins)
global _parser # pylint: disable=global-statement
_parser = helpful
if not detect_defaults:
global _parser # pylint: disable=global-statement
_parser = helpful
return helpful.parse_args()

5
letsencrypt/configuration.py
View file

@ -34,7 +34,7 @@ class NamespaceConfig(object):
"""
zope.interface.implements(interfaces.IConfig)
def __init__(self, namespace, fake=False):
def __init__(self, namespace):
self.namespace = namespace
self.namespace.config_dir = os.path.abspath(self.namespace.config_dir)
@ -42,8 +42,7 @@ class NamespaceConfig(object):
self.namespace.logs_dir = os.path.abspath(self.namespace.logs_dir)
# Check command line parameters sanity, and error out in case of problem.
if not fake:
check_config_sanity(self)
check_config_sanity(self)
def __getattr__(self, name):
return getattr(self.namespace, name)