nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 03:56:01 +01:00
Code Activity

Remove WorkerProto::Op::ImportPaths

Browse source 
This was obsoleted in May 2016 (538a64e8c3).
This commit is contained in:
Eelco Dolstra 2025-09-09 13:44:07 +02:00
parent 4fb61bc5af
commit 86d19956f2
4 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/daemon.cc
View file

@ -546,18 +546,6 @@ static void performOp(
break; break;
} }
case WorkerProto::Op::ImportPaths: {
logger->startWork();
TunnelSource source(conn.from, conn.to);
auto paths = store->importPaths(source, trusted ? NoCheckSigs : CheckSigs);
logger->stopWork();
Strings paths2;
for (auto & i : paths)
paths2.push_back(store->printStorePath(i));
conn.to << paths2;
break;
}
case WorkerProto::Op::BuildPaths: { case WorkerProto::Op::BuildPaths: {
auto drvs = WorkerProto::Serialise<DerivedPaths>::read(*store, rconn); auto drvs = WorkerProto::Serialise<DerivedPaths>::read(*store, rconn);
BuildMode mode = bmNormal; BuildMode mode = bmNormal;

2
src/libstore/include/nix/store/worker-protocol-connection.hh
View file

@ -130,8 +130,6 @@ struct WorkerProto::BasicClientConnection : WorkerProto::BasicConnection
bool * daemonException, bool * daemonException,
const StorePath & path, const StorePath & path,
std::function<void(Source &)> fun); std::function<void(Source &)> fun);
void importPaths(const StoreDirConfig & store, bool * daemonException, Source & source);
}; };
struct WorkerProto::BasicServerConnection : WorkerProto::BasicConnection struct WorkerProto::BasicServerConnection : WorkerProto::BasicConnection

1
src/libstore/include/nix/store/worker-protocol.hh
View file

@ -161,7 +161,6 @@ enum struct WorkerProto::Op : uint64_t {
QueryFailedPaths = 24, QueryFailedPaths = 24,
ClearFailedPaths = 25, ClearFailedPaths = 25,
QueryPathInfo = 26, QueryPathInfo = 26,
ImportPaths = 27, // obsolete
QueryDerivationOutputNames = 28, // obsolete QueryDerivationOutputNames = 28, // obsolete
QueryPathFromHashPart = 29, QueryPathFromHashPart = 29,
QuerySubstitutablePathInfos = 30, QuerySubstitutablePathInfos = 30,

8
src/libstore/worker-protocol-connection.cc
View file

@ -313,12 +313,4 @@ void WorkerProto::BasicClientConnection::narFromPath(
fun(from); fun(from);
} }
void WorkerProto::BasicClientConnection::importPaths(
const StoreDirConfig & store, bool * daemonException, Source & source)
{
to << WorkerProto::Op::ImportPaths;
processStderr(daemonException, 0, &source);
auto importedPaths = WorkerProto::Serialise<StorePathSet>::read(store, *this);
assert(importedPaths.size() <= importedPaths.size());
}
} // namespace nix } // namespace nix