nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 15:32:43 +01:00
Code Activity

Merge remote-tracking branch 'origin/master' into parallel-nix-copy

Browse source
This commit is contained in:
Eelco Dolstra 2022-08-22 15:29:10 +02:00
commit 4c96761c2b
73 changed files with 1353 additions and 1047 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -580,7 +580,6 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
try {
conn->to.written = 0;
conn->to.warn = true;
connections->incCapacity();
{
Finally cleanup([&]() { connections->decCapacity(); });
@ -591,7 +590,6 @@ ref<const ValidPathInfo> RemoteStore::addCAToStore(
dumpString(contents, conn->to);
}
}
conn->to.warn = false;
conn.processStderr();
} catch (SysError & e) {
/* Daemon closed while we were sending the path. Probably OOM