Merge pull request #1707 from dtzWill/fix/issue-1692

ignore "interrupted" exception in progress callback
This commit is contained in:
Peter Simons 2018-04-21 16:51:19 +02:00 committed by GitHub
commit 040acdcee2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -173,7 +173,11 @@ struct CurlDownloader : public Downloader
int progressCallback(double dltotal, double dlnow) int progressCallback(double dltotal, double dlnow)
{ {
act.progress(dlnow, dltotal); try {
act.progress(dlnow, dltotal);
} catch (nix::Interrupted &) {
assert(_isInterrupted);
}
return _isInterrupted; return _isInterrupted;
} }