upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-09 00:32:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Moving check for conflicting args to cli.py

Browse source
This commit is contained in:
Amjad Mashaal 2016-05-25 23:09:17 +02:00
parent a1cb24b3ef
commit 911b4565be
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
certbot/cli.py
View file

@ -343,6 +343,16 @@ class HelpfulArgumentParser(object):
if parsed_args.csr:
self.handle_csr(parsed_args)
# Avoid conflicting args
conficting_args = ["quiet", "noninteractive_mode", "text_mode"]
if parsed_args.dialog_mode:
for arg in conficting_args:
if getattr(parsed_args, arg):
raise errors.Error(
("Conflicting values for displayer."
" {0} conflicts with dialog_mode").format(arg)
)
hooks.validate_hooks(parsed_args)
return parsed_args

10
certbot/main.py
View file

@ -673,16 +673,6 @@ def main(cli_args=sys.argv[1:]):
sys.excepthook = functools.partial(_handle_exception, config=config)
# Avoid conflicting args
conficting_args = ["quiet", "noninteractive_mode", "text_mode"]
if config.dialog_mode:
for arg in conficting_args:
if getattr(config, arg):
raise errors.Error(
("Conflicting values for displayer."
" {0} conflicts with dialog_mode").format(arg)
)
# Displayer
if config.quiet:
config.noninteractive_mode = True