diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-12-02 18:13:33 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-02 18:14:49 +0100 |
| commit | d1e3bf01bce7d8502610532077f6f55c3df4de2c (patch) | |
| tree | be09364c3f1ec59db565c5eabe13b62661c6d3e0 /src/libstore | |
| parent | 8063fc497ab78fa72962b93874fe25dcca2b55ed (diff) | |
daemon: Add 'buildMode' parameter to 'buildPaths' RPC
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/remote-store.cc | 12 | ||||
| -rw-r--r-- | src/libstore/worker-protocol.hh | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index ed9895ac8..262e4650b 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; diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 5a0ef5117..7d9bcb58a 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -6,7 +6,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x10e +#define PROTOCOL_VERSION 0x10f #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) |