summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-07-10 20:30:55 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-07-10 20:30:55 +0900
commit44fcce430a44f9f213328df5c191de8c37e094b5 (patch)
tree874b995694ad7bffa63103b3e7c370de4407a42b
parent4f28c251616b518f16bf2cebb5700a6aad985040 (diff)
downloadbuildstream-artifacts-ostree-push.tar.gz
-rw-r--r--buildstream/_artifactcache/pushreceive.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/buildstream/_artifactcache/pushreceive.py b/buildstream/_artifactcache/pushreceive.py
index e0da3a2af..a7f78710e 100644
--- a/buildstream/_artifactcache/pushreceive.py
+++ b/buildstream/_artifactcache/pushreceive.py
@@ -482,8 +482,10 @@ class OSTreeReceiver(object):
exit_code = self.do_run()
self.close()
return exit_code
- except PushException, BrokenPipeError, tarfile.TarError:
- # Ensure we cleanup files if there was an error
+ except:
+ # BLIND EXCEPT - Just abort if we receive any exception, this
+ # can be a broken pipe, a tarfile read error when the remote
+ # connection is closed, a bug; whatever happens we want to cleanup.
self.close()
raise