diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-11-11 15:11:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-11-11 15:11:10 +0000 |
| commit | 96598e7b06dad0de082730cab8992eacc440e535 (patch) | |
| tree | 0873d1fe273519ca3dfba99df7614979d1408648 | |
| parent | 4166b11a53f16365f9becfa4f29f15047fc221af (diff) | |
* Pass the --no-build-output flag to the daemon.
| -rw-r--r-- | src/libstore/remote-store.cc | 2 | ||||
| -rw-r--r-- | src/libstore/worker-protocol.hh | 2 | ||||
| -rw-r--r-- | src/nix-worker/nix-worker.cc | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc index 66e525642..b89673441 100644 --- a/src/libstore/remote-store.cc +++ b/src/libstore/remote-store.cc @@ -183,6 +183,8 @@ void RemoteStore::setOptions() writeInt(maxSilentTime, to); if (GET_PROTOCOL_MINOR(daemonVersion) >= 2) writeInt(useBuildHook, to); + if (GET_PROTOCOL_MINOR(daemonVersion) >= 4) + writeInt(buildVerbosity, to); processStderr(); } diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh index 63e3f0eb8..a1fa45cf6 100644 --- a/src/libstore/worker-protocol.hh +++ b/src/libstore/worker-protocol.hh @@ -8,7 +8,7 @@ namespace nix { #define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_2 0x6478696f -#define PROTOCOL_VERSION 0x103 +#define PROTOCOL_VERSION 0x104 #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) diff --git a/src/nix-worker/nix-worker.cc b/src/nix-worker/nix-worker.cc index 377f2be73..ddc58c024 100644 --- a/src/nix-worker/nix-worker.cc +++ b/src/nix-worker/nix-worker.cc @@ -426,6 +426,8 @@ static void performOp(unsigned int clientVersion, maxSilentTime = readInt(from); if (GET_PROTOCOL_MINOR(clientVersion) >= 2) useBuildHook = readInt(from) != 0; + if (GET_PROTOCOL_MINOR(clientVersion) >= 4) + buildVerbosity = (Verbosity) readInt(from); startWork(); stopWork(); break; |