forked from lix-project/lix
Also make the backwards compatible case of RemoteStore::addToStore run in constant memory
Just because we can.
This commit is contained in:
parent
97002b684c
commit
ec91840e70
|
@ -385,7 +385,7 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
|
|||
if (GET_PROTOCOL_MINOR(conn->daemonVersion) < 18) {
|
||||
conn->to << wopImportPaths;
|
||||
|
||||
StringSink sink;
|
||||
auto source2 = sinkToSource([&](Sink & sink) {
|
||||
sink << 1 // == path follows
|
||||
;
|
||||
copyNAR(source, sink);
|
||||
|
@ -397,9 +397,9 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
|
|||
<< 0 // == no legacy signature
|
||||
<< 0 // == no path follows
|
||||
;
|
||||
});
|
||||
|
||||
StringSource source(*sink.s);
|
||||
conn->processStderr(0, &source);
|
||||
conn->processStderr(0, source2.get());
|
||||
|
||||
auto importedPaths = readStorePaths<PathSet>(*this, conn->from);
|
||||
assert(importedPaths.size() <= 1);
|
||||
|
|
Loading…
Reference in a new issue