From d1e3bf01bce7d8502610532077f6f55c3df4de2c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 2 Dec 2015 18:13:33 +0100 Subject: daemon: Add 'buildMode' parameter to 'buildPaths' RPC --- src/libstore/remote-store.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/libstore/remote-store.cc') diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index ed9895ac8133..262e4650bfb5 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -438,12 +438,18 @@ Paths RemoteStore::importPaths(bool requireSignature, Source & source) void RemoteStore::buildPaths(const PathSet & drvPaths, BuildMode buildMode) { - if (buildMode != bmNormal) throw Error("repairing or checking is not supported when building through the Nix daemon"); openConnection(); to << wopBuildPaths; - if (GET_PROTOCOL_MINOR(daemonVersion) >= 13) + if (GET_PROTOCOL_MINOR(daemonVersion) >= 13) { to << drvPaths; - else { + if (GET_PROTOCOL_MINOR(daemonVersion) >= 15) + to << buildMode; + else + /* Old daemons did not take a 'buildMode' parameter, so we + need to validate it here on the client side. */ + if (buildMode != bmNormal) + throw Error("repairing or checking is not supported when building through the Nix daemon"); + } else { /* For backwards compatibility with old daemons, strip output identifiers. */ PathSet drvPaths2; -- cgit 1.4.1