upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-08 16:22:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove no names found in configuration files because it sounds like an error but actually it is fine (#8866)

Browse source 
* Remove no names found in configuration files because it sounds like an error but actually it is fine

* fix test

* Pose question more grammatically and specifically, and remove extra space

* fix lint

Co-authored-by: Alex Zorin <alex@zorin.id.au>
This commit is contained in:
ohemorange 2021-05-26 14:54:04 -07:00 committed by GitHub
parent 7ce86f588b
commit 2e31b1ca41
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
certbot/certbot/display/ops.py
View file

@ -123,8 +123,7 @@ def choose_names(installer, question=None):
names = get_valid_domains(domains)
if not names:
return _choose_names_manually(
"No names were found in your configuration files. ")
return _choose_names_manually()
code, names = _filter_names(names, question)
if code == display_util.OK and names:
@ -192,7 +191,8 @@ def _choose_names_manually(prompt_prefix=""):
"""
code, input_ = z_util(interfaces.IDisplay).input(
prompt_prefix +
"Please enter in your domain name(s) (comma and/or space separated) ",
"Please enter the domain name(s) you would like on your certificate "
"(comma and/or space separated)",
cli_flag="--domains", force_interactive=True)
if code == display_util.OK:

1
certbot/tests/display/ops_test.py
View file

@ -209,7 +209,6 @@ class ChooseNamesTest(unittest.TestCase):
actual_doms = self._call(self.mock_install)
self.assertEqual(mock_util().input.call_count, 1)
self.assertEqual(actual_doms, [domain])
self.assertIn("configuration files", mock_util().input.call_args[0][0])
def test_sort_names_trivial(self):
from certbot.display.ops import _sort_names