From 911b4565bea1cb4dbcfc49a4c4ce4337c377e207 Mon Sep 17 00:00:00 2001
From: Amjad Mashaal <me@amjad.io>
Date: Wed, 25 May 2016 23:09:17 +0200
Subject: [PATCH] Moving check for conflicting args to cli.py

---
 certbot/cli.py  | 10 ++++++++++
 certbot/main.py | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/certbot/cli.py b/certbot/cli.py
index 44712ada0..72ec94915 100644
--- a/certbot/cli.py
+++ b/certbot/cli.py
@@ -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
diff --git a/certbot/main.py b/certbot/main.py
index 99d06a69e..4ef2e6ac8 100644
--- a/certbot/main.py
+++ b/certbot/main.py
@@ -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