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

Use readString rather than >> temporary

Browse source 
Fixed the rest of these before, but this one slipped through.
This commit is contained in:
John Ericson 2020-06-04 20:54:55 +00:00
parent 744ce9ce16
commit 94ddea9e2f
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libstore/daemon.cc
View file

@ -708,11 +708,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
info.references = readStorePaths<StorePathSet>(*store, from); info.references = readStorePaths<StorePathSet>(*store, from);
from >> info.registrationTime >> info.narSize >> info.ultimate; from >> info.registrationTime >> info.narSize >> info.ultimate;
info.sigs = readStrings<StringSet>(from); info.sigs = readStrings<StringSet>(from);
{ info.ca = parseContentAddressOpt(readString(from));
string caOptRaw;
from >> caOptRaw;
info.ca = parseContentAddressOpt(caOptRaw);
}
from >> repair >> dontCheckSigs; from >> repair >> dontCheckSigs;
if (!trusted && dontCheckSigs) if (!trusted && dontCheckSigs)
dontCheckSigs = false; dontCheckSigs = false;