starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-28 08:45:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reorganize to make pylint happier

Browse Source
This commit is contained in:
Seth Schoen
2016-02-08 19:06:16 -08:00
parent a8ba6f7c2c
commit 9bc5523a3b
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/cli.py
+11 -10
View File
@@ -884,9 +884,12 @@ def _renewal_conf_files(config):
return glob.glob(os.path.join(config.renewal_configs_dir, "*.conf"))
def _renew_describe_results(renew_successes, renew_failures, renew_skipped,
parse_failures):
def _renew_describe_results(config, renew_successes, renew_failures,
renew_skipped, parse_failures):
status = lambda x, msg: " " + "\n ".join(i + " (" + msg +")" for i in x)
if config.dry_run:
print("** DRY RUN (messages below refer to test certs only!")
print("** The certificates mentioned have not been saved.")
print()
if renew_skipped:
print("The following certs are not due for renewal yet:")
@@ -912,6 +915,10 @@ def _renew_describe_results(renew_successes, renew_failures, renew_skipped,
"were invalid: ")
print(status(parse_failures, "parsefail"))
if config.dry_run:
print("** DRY RUN (messages above refer to test certs only!")
print("** The certificates mentioned have not been saved.")
def renew(config, unused_plugins):
"""Renew previously-obtained certificates."""
@@ -980,14 +987,8 @@ def renew(config, unused_plugins):
renew_failures.append(renewal_candidate.fullchain)
# Describe all the results
if config.dry_run:
print("** DRY RUN (messages below refer to test certs only!")
print("** The certificates mentioned have not been saved.")
_renew_describe_results(renew_successes, renew_failures, renew_skipped,
parse_failures)
if config.dry_run:
print("** DRY RUN (messages above refer to test certs only!")
print("** The certificates mentioned have not been saved.")
_renew_describe_results(config, renew_successes, renew_failures,
renew_skipped, parse_failures)
def revoke(config, unused_plugins): # TODO: coop with renewal config