upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-07 15:52:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Retry, with sanity.

Browse source
This commit is contained in:
Peter Eckersley 2015-06-23 17:38:02 -07:00
parent 4f3753b644
commit 7fe5b8233b
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
letsencrypt/le_util.py
View file

@ -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