wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 05:21:16 +02:00
Code Activity

WIP

Browse source
This commit is contained in:
John Ericson 2020-06-02 00:37:43 +00:00
parent 754c910953
commit efcd30da89
17 changed files with 88 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/daemon.cc
View file

@ -650,7 +650,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
if (GET_PROTOCOL_MINOR(clientVersion) >= 16) {
to << info->ultimate
<< info->sigs
<< info->ca;
<< renderContentAddress(info->ca);
}
} else {
assert(GET_PROTOCOL_MINOR(clientVersion) >= 17);
@ -708,7 +708,12 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
info.references = readStorePaths<StorePathSet>(*store, from);
from >> info.registrationTime >> info.narSize >> info.ultimate;
info.sigs = readStrings<StringSet>(from);
from >> info.ca >> repair >> dontCheckSigs;
{
string caOptRaw;
from >> caOptRaw;
info.ca = parseCaOpt(caOptRaw);
}
from >> repair >> dontCheckSigs;
if (!trusted && dontCheckSigs)
dontCheckSigs = false;
if (!trusted)