Downloader: Propagate exceptions from decompressionSink->finish()

(cherry picked from commit 15fa70cd1b853f5e62662b99ccb9ef3da6cfadff)

1 files changed, 7 insertions, 2 deletions

diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 975cfd97d303..8e94646d49ac 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -327,8 +327,13 @@ struct CurlDownloader : public Downloader
             debug("finished %s of '%s'; curl status = %d, HTTP status = %d, body = %d bytes",
                 request.verb(), request.uri, code, httpStatus, result.bodySize);
 
-            if (decompressionSink)
-                decompressionSink->finish();
+            if (decompressionSink) {
+                try {
+                    decompressionSink->finish();
+                } catch (...) {
+                    writeException = std::current_exception();
+                }
+            }
 
             if (code == CURLE_WRITE_ERROR && result.etag == request.expectedETag) {
                 code = CURLE_OK;