aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/daemon.cc
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 09:48:18 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2021-04-05 09:52:25 -0400
commit9b805d36ac70545fc4c0d863e21e0c2e5f2518a1 (patch)
tree17159577fceae59f879a96789cf1004c7d12fc11 /src/libstore/daemon.cc
parent9dfb97c987d8b9d6a3d15f016e40f22f91deb764 (diff)
Rename Buildable
Diffstat (limited to 'src/libstore/daemon.cc')
-rw-r--r--src/libstore/daemon.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 6b527dcb2..affd60472 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -260,14 +260,14 @@ static void writeValidPathInfo(
}
}
-static std::vector<BuildableReq> readBuildableReqs(Store & store, unsigned int clientVersion, Source & from)
+static std::vector<DerivedPath> readDerivedPaths(Store & store, unsigned int clientVersion, Source & from)
{
- std::vector<BuildableReq> reqs;
+ std::vector<DerivedPath> reqs;
if (GET_PROTOCOL_MINOR(clientVersion) >= 29) {
- reqs = worker_proto::read(store, from, Phantom<std::vector<BuildableReq>> {});
+ reqs = worker_proto::read(store, from, Phantom<std::vector<DerivedPath>> {});
} else {
for (auto & s : readStrings<Strings>(from))
- reqs.push_back(parsePathWithOutputs(store, s).toBuildableReq());
+ reqs.push_back(parsePathWithOutputs(store, s).toDerivedPath());
}
return reqs;
}
@@ -506,7 +506,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
}
case wopBuildPaths: {
- auto drvs = readBuildableReqs(*store, clientVersion, from);
+ auto drvs = readDerivedPaths(*store, clientVersion, from);
BuildMode mode = bmNormal;
if (GET_PROTOCOL_MINOR(clientVersion) >= 15) {
mode = (BuildMode) readInt(from);
@@ -870,7 +870,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
}
case wopQueryMissing: {
- auto targets = readBuildableReqs(*store, clientVersion, from);
+ auto targets = readDerivedPaths(*store, clientVersion, from);
logger->startWork();
StorePathSet willBuild, willSubstitute, unknown;
uint64_t downloadSize, narSize;