commit e06907babb3edc47f7e220a8445dbd125aa3934e
author Josh Smith <joshsmith@codethink.co.uk> Thu Jul 26 13:43:40 2018 +0100
committer Josh Smith <joshsmith@codethink.co.uk> Fri Aug 03 16:31:48 2018 +0100
tree 3adc9b46ac93791ecfeea78e55eecbe5a02a16da
parent a27de512404705404a9a4b2504d9e772ba310d97

cascache.py: Raise ArtifactError on grpc error

This aims to fix issue #502.

buildstream/_artifactcache/cascache.py

diff --git a/buildstream/_artifactcache/cascache.py b/buildstream/_artifactcache/cascache.py
index 32de7d1..a8464c2 100644
--- a/buildstream/_artifactcache/cascache.py
+++ b/buildstream/_artifactcache/cascache.py
@@ -238,7 +238,8 @@
 
             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
 
@@ -279,6 +280,7 @@
 
                     except grpc.RpcError as e:
                         if e.code() != grpc.StatusCode.NOT_FOUND:
+                            # Intentionally re-raise RpcError for outer except block.
                             raise
 
                     missing_blobs = {}