upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-06 07:12:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Caught bug in display... referencing 0 instead of OK variable

Browse source
This commit is contained in:
James Kasten 2014-11-20 15:42:13 -08:00
parent e79b379e67
commit 95fbf69206
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
letsencrypt/client/client.py
View file

@ -286,7 +286,6 @@ class Client(object):
self.redirect = display.redirect_by_default()
if self.redirect:
print "HERE"
self.redirect_to_ssl(vhost)
self.config.restart(quiet=self.curses)
@ -520,12 +519,12 @@ class Client(object):
def redirect_to_ssl(self, vhost):
for ssl_vh in vhost:
success, redirect_vhost = self.config.enable_redirect(ssl_vh)
logger.info("\nRedirect vhost: " + redirect_vhost.file +
success, redirect_vhost = self.config.enable_redirect(ssl_vh)
logger.info("\nRedirect vhost: " + redirect_vhost.file +
" - " + str(success))
# If successful, make sure redirect site is enabled
if success:
self.config.enable_site(redirect_vhost)
# If successful, make sure redirect site is enabled
if success:
self.config.enable_site(redirect_vhost)
def get_virtual_hosts(self, domains):

4
letsencrypt/client/display.py
View file

@ -309,11 +309,11 @@ def redirect_by_default():
"Please enter the appropriate number",
width = WIDTH)
if result[0] != 0:
if result[0] != OK:
return False
# different answer for each type of display
return (result[1] == "Secure" or result[1] == 1)
return (str(result[1]) == "Secure" or result[1] == 1)
def confirm_revocation(cert):