Try things with just print()

This commit is contained in:
Peter Eckersley
2016-04-02 12:25:10 -07:00
parent 7fbd800ddd
commit f5e0aca891
2 changed files with 4 additions and 8 deletions
+1 -1
View File
@@ -674,7 +674,7 @@ def main(cli_args=sys.argv[1:]):
# Displayer # Displayer
if config.quiet: if config.quiet:
config.noninteractive_mode = True config.noninteractive_mode = True
displayer = display_util.NoninteractiveDisplay(open("/dev/null", "w")) displayer = display_util.NoninteractiveDisplay(open(os.devnull, "w"))
elif config.noninteractive_mode: elif config.noninteractive_mode:
displayer = display_util.NoninteractiveDisplay(sys.stdout) displayer = display_util.NoninteractiveDisplay(sys.stdout)
elif config.text_mode: elif config.text_mode:
+3 -7
View File
@@ -295,13 +295,9 @@ def _renew_describe_results(config, renew_successes, renew_failures,
notify("** DRY RUN: simulating 'letsencrypt renew' close to cert expiry") notify("** DRY RUN: simulating 'letsencrypt renew' close to cert expiry")
notify("** (The test certificates above have not been saved.)") notify("** (The test certificates above have not been saved.)")
if config.quiet and (renew_failures or parse_failures): if config.quiet and not (renew_failures or parse_failures):
# In case of errors, spin up a new non-quiet output display return
dest = display_util.NoninteractiveDisplay(sys.stdout) print("\n".join(out))
else:
dest = zope.component.getUtility(interfaces.IDisplay)
dest.notification("\n".join(out), pause=False)
def renew_all_lineages(config): def renew_all_lineages(config):