picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Downloader: Propagate exceptions from decompressionSink->finish() 

(cherry picked from commit 15fa70cd1b853f5e62662b99ccb9ef3da6cfadff)
This commit is contained in:
Eelco Dolstra 2019-06-24 21:06:37 +02:00
parent b43e1e186e
commit 2fef4dd296
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libstore/download.cc
View File

@ -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;