diff options
author | Abderrahim Kitouni <akitouni@gnome.org> | 2019-04-21 21:34:55 +0100 |
---|---|---|
committer | Abderrahim Kitouni <a.kitouni@gmail.com> | 2019-04-22 15:20:58 +0000 |
commit | e32ea9d08a971eb53d481cd8ce54d9464af321e4 (patch) | |
tree | fffc5a9d5b7928eaed478b7ae3ed250a40cbac54 | |
parent | 58d8b1c7c22b9cf67a73d930ac62a78d9a396c4d (diff) | |
download | buildstream-abderrahim/non-strict-key-display.tar.gz |
_artifactcache.py: display the actual key being pulledabderrahim/non-strict-key-display
Fixes #981
-rw-r--r-- | buildstream/_artifactcache.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/_artifactcache.py b/buildstream/_artifactcache.py index 7a6f2ea0c..5b0ccacc4 100644 --- a/buildstream/_artifactcache.py +++ b/buildstream/_artifactcache.py @@ -317,12 +317,12 @@ class ArtifactCache(BaseCache): # def pull(self, element, key, *, progress=None, subdir=None, excluded_subdirs=None): ref = element.get_artifact_name(key) + display_key = key[:self.context.log_key_length] project = element._get_project() for remote in self._remotes[project]: try: - display_key = element._get_brief_display_key() element.status("Pulling artifact {} <- {}".format(display_key, remote.spec.url)) if self.cas.pull(ref, remote, progress=progress, subdir=subdir, excluded_subdirs=excluded_subdirs): @@ -331,12 +331,12 @@ class ArtifactCache(BaseCache): return True else: element.info("Remote ({}) does not have artifact {} cached".format( - remote.spec.url, element._get_brief_display_key() + remote.spec.url, display_key )) except CASError as e: raise ArtifactError("Failed to pull artifact {}: {}".format( - element._get_brief_display_key(), e)) from e + display_key, e)) from e return False |