mirror of
https://github.com/NixOS/nix
synced 2025-06-26 03:21:16 +02:00
HttpBinaryCacheStore::getFile(): Fix uncaught exception
This method is marked as `noexcept`, but `enqueueFileTransfer()` can throw `Interrupted` if the user has hit Ctrl-C or if the `ThreadPool` that the thread is a part of is shutting down.
This commit is contained in:
parent
0ed67e5b7e
commit
4566854981
1 changed files with 19 additions and 18 deletions
|
@ -169,10 +169,6 @@ protected:
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
checkEnabled();
|
checkEnabled();
|
||||||
} catch (...) {
|
|
||||||
callback.rethrow();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto request(makeRequest(path));
|
auto request(makeRequest(path));
|
||||||
|
|
||||||
|
@ -191,6 +187,11 @@ protected:
|
||||||
callbackPtr->rethrow();
|
callbackPtr->rethrow();
|
||||||
}
|
}
|
||||||
}});
|
}});
|
||||||
|
|
||||||
|
} catch (...) {
|
||||||
|
callback.rethrow();
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue