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

Move lineage.has_pending_deployment() check up to _auth_from_domains

Browse source 
Less conceptually nice, but in the "renew" verb case it wasn't being called :(
This commit is contained in:
Peter Eckersley 2016-09-29 14:26:55 -07:00
parent dd46661547
commit a7fe734d73
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
certbot/main.py
View file

@ -87,6 +87,12 @@ def _auth_from_domains(le_client, config, domains, lineage=None):
# interested in
action = "renew"
if action == "renew" and lineage.has_pending_deployment():
logger.warn("Found a new cert /archive/ that was not linked to in /live/; "
"fixing and reinstalling..")
lineage.update_all_links_to(lineage.latest_common_version())
return lineage, "reinstall"
if action == "reinstall":
# The lineage already exists; allow the caller to try installing
# it without getting a new certificate at all.
@ -165,11 +171,6 @@ def _handle_identical_cert_request(config, lineage):
:rtype: tuple
"""
if lineage.has_pending_deployment():
logger.warn("Found a new cert /archive/ that was not linked to in /live/; "
"fixing and reinstalling..")
lineage.update_all_links_to(lineage.latest_common_version())
return "reinstall", lineage
if renewal.should_renew(config, lineage):
return "renew", lineage
if config.reinstall: