From 7fe5b8233bee880a2b143135fd7632f797f94905 Mon Sep 17 00:00:00 2001 From: Peter Eckersley Date: Tue, 23 Jun 2015 17:38:02 -0700 Subject: [PATCH] Retry, with sanity. --- letsencrypt/le_util.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/letsencrypt/le_util.py b/letsencrypt/le_util.py index f8c457c37..0f8207b7a 100644 --- a/letsencrypt/le_util.py +++ b/letsencrypt/le_util.py @@ -32,14 +32,8 @@ def make_or_verify_dir(directory, mode=0o755, uid=0): except OSError as exception: if exception.errno == errno.EEXIST: if not check_permissions(directory, mode, uid): -<<<<<<< HEAD - raise errors.LetsEncryptClientError( - "%s exists, this client can't access it" % directory) -======= raise errors.Error( - "%s exists, but does not have the proper " - "permissions or owner" % directory) ->>>>>>> letsencrypt/master + "%s exists, this client can't access it" % directory) else: raise