From aa97cd57163a5d3cfe01de0f4062c08b62f39f3c Mon Sep 17 00:00:00 2001 From: Abderrahim Kitouni Date: Sun, 21 Apr 2019 21:34:55 +0100 Subject: _artifactcache.py: display the actual key being pulled Fixes #981 --- buildstream/_artifactcache.py | 6 +++--- 1 file 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 -- cgit v1.2.1