kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

RemoteStore::queryRealisationUncached(): Fix potential noexcept violation

Browse source
This commit is contained in:
Eelco Dolstra 2022-05-30 13:27:13 +02:00
parent b8faa83742
commit 6378f0bb32
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/remote-store.cc
View file

@ -718,13 +718,12 @@ void RemoteStore::registerDrvOutput(const Realisation & info)
void RemoteStore::queryRealisationUncached(const DrvOutput & id, void RemoteStore::queryRealisationUncached(const DrvOutput & id,
Callback<std::shared_ptr<const Realisation>> callback) noexcept Callback<std::shared_ptr<const Realisation>> callback) noexcept
{ {
try {
auto conn(getConnection()); auto conn(getConnection());
if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 27) { if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 27) {
warn("the daemon is too old to support content-addressed derivations, please upgrade it to 2.4"); warn("the daemon is too old to support content-addressed derivations, please upgrade it to 2.4");
try { return callback(nullptr);
callback(nullptr);
} catch (...) { return callback.rethrow(); }
} }
conn->to << wopQueryRealisation; conn->to << wopQueryRealisation;
@ -747,7 +746,6 @@ void RemoteStore::queryRealisationUncached(const DrvOutput & id,
} }
}(); }();
try {
callback(std::shared_ptr<const Realisation>(real)); callback(std::shared_ptr<const Realisation>(real));
} catch (...) { return callback.rethrow(); } } catch (...) { return callback.rethrow(); }
} }