diff --git a/certbot/main.py b/certbot/main.py index 161e7d7cd..d900c65fa 100644 --- a/certbot/main.py +++ b/certbot/main.py @@ -669,6 +669,16 @@ 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 diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py index ca33f4524..64cf98c2c 100644 --- a/certbot/tests/cli_test.py +++ b/certbot/tests/cli_test.py @@ -49,7 +49,7 @@ class CLITest(unittest.TestCase): # pylint: disable=too-many-public-methods self.logs_dir = os.path.join(self.tmp_dir, 'logs') self.standard_args = ['--config-dir', self.config_dir, '--work-dir', self.work_dir, - '--logs-dir', self.logs_dir, '--text'] + '--logs-dir', self.logs_dir] def tearDown(self): shutil.rmtree(self.tmp_dir)