summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2018-08-16 10:57:27 +0100
committerJavier Jardón <jjardon@gnome.org>2018-08-16 16:20:57 +0000
commit3200093e9b4377ae809ecdd1928d1dc34bc0c962 (patch)
treeeed128c6771799c7336d42da50bbd41f94cbe9c4
parent87960822f8f66f4c31a89d834d80929add13887d (diff)
downloadbuildstream-3200093e9b4377ae809ecdd1928d1dc34bc0c962.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 4fea98626..5c56e93b7 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -24,6 +24,7 @@ import os
import signal
import stat
import tempfile
+import errno
from urllib.parse import urlparse
import grpc
@@ -81,7 +82,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
@@ -99,7 +101,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