diff options
| author | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-06 15:52:33 -0400 |
|---|---|---|
| committer | Carlo Nucera <carlo.nucera@protonmail.com> | 2020-08-06 15:53:09 -0400 |
| commit | f795f0fabc785cd2eb2ccfec71564c8af819ecf4 (patch) | |
| tree | 76b0719449f036ea9312a9fb96e5ea241b455d9d /src/libstore/legacy-ssh-store.cc | |
| parent | 7302761f6451dafd8834f0db9fdd7dcc27f49eff (diff) | |
| parent | 8b175f58d1a25dd904fb0ffdf5b2b9501983dba0 (diff) | |
Merge branch 'drv-outputs-map-allow-missing-namespace' of github.com:obsidiansystems/nix into templated-daemon-protocol
Diffstat (limited to 'src/libstore/legacy-ssh-store.cc')
| -rw-r--r-- | src/libstore/legacy-ssh-store.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc index 52c03e116..0951610d3 100644 --- a/src/libstore/legacy-ssh-store.cc +++ b/src/libstore/legacy-ssh-store.cc @@ -107,7 +107,7 @@ struct LegacySSHStore : public Store auto deriver = readString(conn->from); if (deriver != "") info->deriver = parseStorePath(deriver); - info->references = read(*this, conn->from, Proxy<StorePathSet> {}); + info->references = nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {}); readLongLong(conn->from); // download size info->narSize = readLongLong(conn->from); @@ -139,7 +139,7 @@ struct LegacySSHStore : public Store << printStorePath(info.path) << (info.deriver ? printStorePath(*info.deriver) : "") << info.narHash->to_string(Base16, false); - write(*this, conn->to, info.references); + nix::worker_proto::write(*this, conn->to, info.references); conn->to << info.registrationTime << info.narSize @@ -168,7 +168,7 @@ struct LegacySSHStore : public Store conn->to << exportMagic << printStorePath(info.path); - write(*this, conn->to, info.references); + nix::worker_proto::write(*this, conn->to, info.references); conn->to << (info.deriver ? printStorePath(*info.deriver) : "") << 0 @@ -251,10 +251,10 @@ struct LegacySSHStore : public Store conn->to << cmdQueryClosure << includeOutputs; - write(*this, conn->to, paths); + nix::worker_proto::write(*this, conn->to, paths); conn->to.flush(); - for (auto & i : read(*this, conn->from, Proxy<StorePathSet> {})) + for (auto & i : nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {})) out.insert(i); } @@ -267,10 +267,10 @@ struct LegacySSHStore : public Store << cmdQueryValidPaths << false // lock << maybeSubstitute; - write(*this, conn->to, paths); + nix::worker_proto::write(*this, conn->to, paths); conn->to.flush(); - return read(*this, conn->from, Proxy<StorePathSet> {}); + return nix::worker_proto::read(*this, conn->from, Phantom<StorePathSet> {}); } void connect() override |