diff options
author | Tristan Maat <tm@tlater.net> | 2018-07-27 10:22:41 +0000 |
---|---|---|
committer | Tristan Maat <tm@tlater.net> | 2018-07-27 10:22:41 +0000 |
commit | 48916b8a493eec873421d3b867515fb829d1faf8 (patch) | |
tree | 722bb06da3f13df43354dd098252b06f7c5bfff0 | |
parent | 4d86e7c51a6729b29138dcc70ac738a3a9d7e1bd (diff) | |
parent | fb222ba13fdd876f4a1506024d26d50675e49960 (diff) | |
download | buildstream-48916b8a493eec873421d3b867515fb829d1faf8.tar.gz |
Merge branch 'Qinusty/502' into 'master'
cascache.py: Raise ArtifactError on grpc error
Closes #502
See merge request BuildStream/buildstream!576
-rw-r--r-- | buildstream/_artifactcache/cascache.py | 4 |
1 files changed, 3 insertions, 1 deletions
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 = {} |