From a809a059f0512159279b5dcbc100374393327e4b Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 11 Oct 2015 15:57:57 -0400 Subject: [PATCH] Don't create renewal_configs_dir and config_dir, instead just print a helpful error message and fail --- letsencrypt/renewer.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/letsencrypt/renewer.py b/letsencrypt/renewer.py index ebd9a42d1..76922e6fd 100644 --- a/letsencrypt/renewer.py +++ b/letsencrypt/renewer.py @@ -169,14 +169,14 @@ def main(config=None, cli_args=sys.argv[1:]): config.merge(configobj.ConfigObj(cli_config.renewer_config_file)) # Ensure that all of the needed folders have been created before continuing uid = os.geteuid() - le_util.make_or_verify_dir( - cli_config.renewal_configs_dir, constants.CONFIG_DIRS_MODE, uid) - le_util.make_or_verify_dir( - cli_config.config_dir, constants.CONFIG_DIRS_MODE, uid) - le_util.make_or_verify_dir( - cli_config.work_dir, constants.CONFIG_DIRS_MODE, uid) - le_util.make_or_verify_dir( - cli_config.logs_dir, constants.CONFIG_DIRS_MODE, uid) + if (not os.path.isdir(cli_config.renewal_configs_dir) or + not os.path.isdir(cli_config.config_dir)): + print "Could not find config directory. Exiting. " + else: + le_util.make_or_verify_dir( + cli_config.work_dir, constants.CONFIG_DIRS_MODE, uid) + le_util.make_or_verify_dir( + cli_config.logs_dir, constants.CONFIG_DIRS_MODE, uid) for i in os.listdir(cli_config.renewal_configs_dir): print "Processing", i