From 875b94d45ab64962aa804a1da7af4e24f9c20620 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 22 Sep 2016 15:39:21 -0700
Subject: [PATCH] remove unhelpful question about servernames and default
 vhosts

---
 certbot/display/ops.py            | 13 +------------
 certbot/tests/display/ops_test.py |  8 --------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/certbot/display/ops.py b/certbot/display/ops.py
index e8520fe96..6930381f6 100644
--- a/certbot/display/ops.py
+++ b/certbot/display/ops.py
@@ -103,18 +103,7 @@ def choose_names(installer):
     names = get_valid_domains(domains)
 
     if not names:
-        manual = z_util(interfaces.IDisplay).yesno(
-            "No names were found in your configuration files.{0}You should "
-            "specify ServerNames in your config files in order to allow for "
-            "accurate installation of your certificate.{0}"
-            "If you do use the default vhost, you may specify the name "
-            "manually. Would you like to continue?{0}".format(os.linesep),
-            default=True)
-
-        if manual:
-            return _choose_names_manually()
-        else:
-            return []
+        return _choose_names_manually()
 
     code, names = _filter_names(names)
     if code == display_util.OK and names:
diff --git a/certbot/tests/display/ops_test.py b/certbot/tests/display/ops_test.py
index 26f67b69f..d96979906 100644
--- a/certbot/tests/display/ops_test.py
+++ b/certbot/tests/display/ops_test.py
@@ -206,7 +206,6 @@ class ChooseNamesTest(unittest.TestCase):
     @mock.patch("certbot.display.ops.z_util")
     def test_no_names_choose(self, mock_util):
         self.mock_install().get_all_names.return_value = set()
-        mock_util().yesno.return_value = True
         domain = "example.com"
         mock_util().input.return_value = (display_util.OK, domain)
 
@@ -214,13 +213,6 @@ class ChooseNamesTest(unittest.TestCase):
         self.assertEqual(mock_util().input.call_count, 1)
         self.assertEqual(actual_doms, [domain])
 
-    @mock.patch("certbot.display.ops.z_util")
-    def test_no_names_quit(self, mock_util):
-        self.mock_install().get_all_names.return_value = set()
-        mock_util().yesno.return_value = False
-
-        self.assertEqual(self._call(self.mock_install), [])
-
     @mock.patch("certbot.display.ops.z_util")
     def test_filter_names_valid_return(self, mock_util):
         self.mock_install.get_all_names.return_value = set(["example.com"])