summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2018-08-16 10:57:27 +0100
committerTiago Gomes <tiago.gomes@codethink.co.uk>2018-08-16 14:54:54 +0100
commitb62c361c427a20bc5c2e2811cd2629b012cbe5df (patch)
tree980e5c279b7efe8faadb1560da86bc859d9ad4a5
parent898aa8a02c1d54a4d68eba25d54247bcf85d55d4 (diff)
downloadbuildstream-b62c361c427a20bc5c2e2811cd2629b012cbe5df.tar.gz
cascache: use errno module
os.errno does no longer work with Python 3.7 Closes #577.
-rw-r--r--buildstream/_artifactcache/cascache.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py
index 00d09773c..074899d81 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -25,6 +25,7 @@ import signal
import stat
import tempfile
import uuid
+import errno
from urllib.parse import urlparse
import grpc
@@ -82,7 +83,8 @@ class CASCache(ArtifactCache):
tree = self.resolve_ref(ref, update_mtime=True)
- dest = os.path.join(self.extractdir, element._get_project().name, element.normal_name, tree.hash)
+ dest = os.path.join(self.extractdir, element._get_project().name,
+ element.normal_name, tree.hash)
if os.path.isdir(dest):
# artifact has already been extracted
return dest
@@ -100,7 +102,7 @@ class CASCache(ArtifactCache):
#
# If rename fails with these errors, another process beat
# us to it so just ignore.
- if e.errno not in [os.errno.ENOTEMPTY, os.errno.EEXIST]:
+ if e.errno not in [errno.ENOTEMPTY, errno.EEXIST]:
raise ArtifactError("Failed to extract artifact for ref '{}': {}"
.format(ref, e)) from e