aboutsummaryrefslogtreecommitdiff
path: root/nix/nix-daemon
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-12-02 18:43:51 +0200
committerLudovic Courtès <ludo@gnu.org>2015-12-02 19:37:59 +0200
commit708d9070006fd46ffe4c2c3cf64154ea4430202a (patch)
treee951682bb1d8b22dadd4971425d9da74a6ec05db /nix/nix-daemon
parente134baae774eaa78e7ae8c3d87db50170f023536 (diff)
downloadgnu-guix-708d9070006fd46ffe4c2c3cf64154ea4430202a.tar
gnu-guix-708d9070006fd46ffe4c2c3cf64154ea4430202a.tar.gz
daemon: Add 'buildMode' parameter to 'buildPaths' RPC.
* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump to 0x10f. * nix/libstore/remote-store.cc (RemoteStore::buildPaths): Send the BUILDMODE when the daemon supports it. Reject invalid values of BUILDMODE for old daemons. * nix/nix-daemon/nix-daemon.cc (performOp) <wopBuildPaths>: Read the build mode when the client supports it.
Diffstat (limited to 'nix/nix-daemon')
-rw-r--r--nix/nix-daemon/nix-daemon.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/nix/nix-daemon/nix-daemon.cc b/nix/nix-daemon/nix-daemon.cc
index bd9eebe0a9..c1e697bcac 100644
--- a/nix/nix-daemon/nix-daemon.cc
+++ b/nix/nix-daemon/nix-daemon.cc
@@ -451,8 +451,17 @@ static void performOp(bool trusted, unsigned int clientVersion,
case wopBuildPaths: {
PathSet drvs = readStorePaths<PathSet>(from);
+ BuildMode mode = bmNormal;
+ if (GET_PROTOCOL_MINOR(clientVersion) >= 15) {
+ mode = (BuildMode)readInt(from);
+
+ /* Repairing is not atomic, so disallowed for "untrusted"
+ clients. */
+ if (mode == bmRepair && !trusted)
+ throw Error("repairing is not supported when building through the Nix daemon");
+ }
startWork();
- store->buildPaths(drvs);
+ store->buildPaths(drvs, mode);
stopWork();
writeInt(1, to);
break;