about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-04-21T14·51+0200
committerGitHub <noreply@github.com>2018-04-21T14·51+0200
commit040acdcee2fcf5647896ba12316b4f9184275a70 (patch)
treee0de4ac64062ed8328436848fbf8fe952c591b2c
parent9296186c759f1ef301e20fc7e246f104a206efa4 (diff)
parent79f5c296c05bd8754d90272468c985f34b824b4b (diff)
Merge pull request #1707 from dtzWill/fix/issue-1692
ignore "interrupted" exception in progress callback
-rw-r--r--src/libstore/download.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libstore/download.cc b/src/libstore/download.cc
index 4d7f5690192d..58fd8eedeca9 100644
--- a/src/libstore/download.cc
+++ b/src/libstore/download.cc
@@ -173,7 +173,11 @@ struct CurlDownloader : public Downloader
 
         int progressCallback(double dltotal, double dlnow)
         {
-            act.progress(dlnow, dltotal);
+            try {
+              act.progress(dlnow, dltotal);
+            } catch (nix::Interrupted &) {
+              assert(_isInterrupted);
+            }
             return _isInterrupted;
         }