From fb222ba13fdd876f4a1506024d26d50675e49960 Mon Sep 17 00:00:00 2001 From: Josh Smith Date: Thu, 26 Jul 2018 13:43:40 +0100 Subject: cascache.py: Raise ArtifactError on grpc error This aims to fix issue #502. --- buildstream/_artifactcache/cascache.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py index 6f5898426..3ef563368 100644 --- a/buildstream/_artifactcache/cascache.py +++ b/buildstream/_artifactcache/cascache.py @@ -240,7 +240,8 @@ class CASCache(ArtifactCache): except grpc.RpcError as e: if e.code() != grpc.StatusCode.NOT_FOUND: - raise + raise ArtifactError("Failed to pull artifact {}: {}".format( + element._get_brief_display_key(), e)) from e return False @@ -285,6 +286,7 @@ class CASCache(ArtifactCache): except grpc.RpcError as e: if e.code() != grpc.StatusCode.NOT_FOUND: + # Intentionally re-raise RpcError for outer except block. raise missing_blobs = {} -- cgit v1.2.1