From 98d9ba255907a2d6d96095392c37b71700ccff1e 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/cascache.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'buildstream') diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py index 9bad0df5e..b40b07409 100644 --- a/buildstream/_artifactcache/cascache.py +++ b/buildstream/_artifactcache/cascache.py @@ -237,13 +237,13 @@ class CASCache(ArtifactCache): def pull(self, element, key, *, progress=None): ref = self.get_artifact_fullname(element, key) + display_key = key[:self.context.log_key_length] project = element._get_project() for remote in self._remotes[project]: try: remote.init() - display_key = element._get_brief_display_key() element.status("Pulling artifact {} <- {}".format(display_key, remote.spec.url)) request = buildstream_pb2.GetReferenceRequest() @@ -265,14 +265,14 @@ class CASCache(ArtifactCache): except grpc.RpcError as e: if e.code() != grpc.StatusCode.NOT_FOUND: raise ArtifactError("Failed to pull artifact {}: {}".format( - element._get_brief_display_key(), e)) from e + display_key, e)) from e else: element.info("Remote ({}) does not have {} cached".format( - remote.spec.url, element._get_brief_display_key() + remote.spec.url, display_key )) except BlobNotFound as e: element.info("Remote ({}) does not have {} cached".format( - remote.spec.url, element._get_brief_display_key() + remote.spec.url, display_key )) return False -- cgit v1.2.1