From 63b0d62f7bc6329bdc5c6c69920e451e309dd2fb Mon Sep 17 00:00:00 2001 From: James Kasten Date: Thu, 10 Sep 2015 23:46:02 -0700 Subject: [PATCH 1/2] fix #765 --- letsencrypt/storage.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/letsencrypt/storage.py b/letsencrypt/storage.py index 5b1e90edc..2ca423ae0 100644 --- a/letsencrypt/storage.py +++ b/letsencrypt/storage.py @@ -268,7 +268,8 @@ class RenewableCert(object): # pylint: disable=too-many-instance-attributes if kind not in ALL_FOUR: raise errors.CertStorageError("unknown kind of item") where = os.path.dirname(self.current_target(kind)) - return os.path.join(where, "{0}{1}.pem".format(kind, version)) + return os.path.abspath( + os.path.join(where, "{0}{1}.pem".format(kind, version))) def available_versions(self, kind): """Which alternative versions of the specified kind of item exist? From 1a5f0c434e2b0956aabe8efc41cad6c0d629af00 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Fri, 11 Sep 2015 00:02:09 -0700 Subject: [PATCH 2/2] remove source of abspath problem... not side-effect --- letsencrypt/storage.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/letsencrypt/storage.py b/letsencrypt/storage.py index 2ca423ae0..e8b36d5cb 100644 --- a/letsencrypt/storage.py +++ b/letsencrypt/storage.py @@ -223,7 +223,7 @@ class RenewableCert(object): # pylint: disable=too-many-instance-attributes target = os.readlink(link) if not os.path.isabs(target): target = os.path.join(os.path.dirname(link), target) - return target + return os.path.abspath(target) def current_version(self, kind): """Returns numerical version of the specified item. @@ -268,8 +268,7 @@ class RenewableCert(object): # pylint: disable=too-many-instance-attributes if kind not in ALL_FOUR: raise errors.CertStorageError("unknown kind of item") where = os.path.dirname(self.current_target(kind)) - return os.path.abspath( - os.path.join(where, "{0}{1}.pem".format(kind, version))) + return os.path.join(where, "{0}{1}.pem".format(kind, version)) def available_versions(self, kind): """Which alternative versions of the specified kind of item exist?