Removed duplicate cancel

This commit is contained in:
Brad Warren
2015-12-16 14:33:41 -08:00
parent f387fe80a8
commit d06c6f27bd
+2 -3
View File
@@ -276,12 +276,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") response = display.menu(question, choices, "OK", "Cancel")
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(