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

Also make the backwards compatible case of RemoteStore::addToStore run in constant memory

Browse source 
Just because we can.
This commit is contained in:
Eelco Dolstra 2018-03-21 23:46:03 +01:00
parent 97002b684c
commit ec91840e70
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -385,7 +385,7 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 18) { if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 18) {
conn->to << wopImportPaths; conn->to << wopImportPaths;
StringSink sink; auto source2 = sinkToSource([&](Sink & sink) {
sink << 1 // == path follows sink << 1 // == path follows
; ;
copyNAR(source, sink); copyNAR(source, sink);
@ -397,9 +397,9 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
<< 0 // == no legacy signature << 0 // == no legacy signature
<< 0 // == no path follows << 0 // == no path follows
; ;
});
StringSource source(*sink.s); conn->processStderr(0, source2.get());
conn->processStderr(0, &source);
auto importedPaths = readStorePaths<PathSet>(*this, conn->from); auto importedPaths = readStorePaths<PathSet>(*this, conn->from);
assert(importedPaths.size() <= 1); assert(importedPaths.size() <= 1);