mirror of
https://github.com/certbot/certbot.git
synced 2026-08-04 12:21:51 +02:00
Merge pull request #1921 from letsencrypt/no-cancel-dupe
Removed duplicate cancel
This commit is contained in:
+2
-3
@@ -319,12 +319,11 @@ def _handle_identical_cert_request(config, cert):
|
|||||||
elif config.verb == "certonly":
|
elif config.verb == "certonly":
|
||||||
keep_opt = "Keep the existing certificate for now"
|
keep_opt = "Keep the existing certificate for now"
|
||||||
choices = [keep_opt,
|
choices = [keep_opt,
|
||||||
"Renew & replace the cert (limit ~5 per 7 days)",
|
"Renew & replace the cert (limit ~5 per 7 days)"]
|
||||||
"Cancel this operation and do nothing"]
|
|
||||||
|
|
||||||
display = zope.component.getUtility(interfaces.IDisplay)
|
display = zope.component.getUtility(interfaces.IDisplay)
|
||||||
response = display.menu(question, choices, "OK", "Cancel", default=0)
|
response = display.menu(question, choices, "OK", "Cancel", default=0)
|
||||||
if response[0] == "cancel" or response[1] == 2:
|
if response[0] == display_util.CANCEL:
|
||||||
# TODO: Add notification related to command-line options for
|
# TODO: Add notification related to command-line options for
|
||||||
# skipping the menu for this case.
|
# skipping the menu for this case.
|
||||||
raise errors.Error(
|
raise errors.Error(
|
||||||
|
|||||||
Reference in New Issue
Block a user