nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-20 09:19:36 +01:00
Code Activity

Merge remote-tracking branch 'origin/master' into configs

Browse source
This commit is contained in:
Eelco Dolstra 2020-09-22 15:35:44 +02:00
commit c559570c08
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -541,7 +541,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
const StorePathSet & references, const StorePathSet & references,
RepairFlag repair) RepairFlag repair)
{ {
auto conn(getConnection()); std::optional<ConnectionHandle> conn_(getConnection());
auto & conn = *conn_;
if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 25) { if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 25) {
@ -605,6 +606,8 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
} }
}, caMethod); }, caMethod);
auto path = parseStorePath(readString(conn->from)); auto path = parseStorePath(readString(conn->from));
// Release our connection to prevent a deadlock in queryPathInfo().
conn_.reset();
return queryPathInfo(path); return queryPathInfo(path);
} }
} }