diff options
author | Javier Jardón <jjardon@gnome.org> | 2018-08-16 17:11:29 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2018-08-16 17:11:29 +0000 |
commit | 6c35850b535d7cc5f20d7c9178f7ac35a70ce727 (patch) | |
tree | eed128c6771799c7336d42da50bbd41f94cbe9c4 | |
parent | 87960822f8f66f4c31a89d834d80929add13887d (diff) | |
parent | 3200093e9b4377ae809ecdd1928d1dc34bc0c962 (diff) | |
download | buildstream-6c35850b535d7cc5f20d7c9178f7ac35a70ce727.tar.gz |
Merge branch 'tiagogomes/issue-577-backport' into 'bst-1.2'
cascache: use errno module
See merge request BuildStream/buildstream!675
-rw-r--r-- | buildstream/_artifactcache/cascache.py | 6 |
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 |