TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Pass the --no-build-output flag to the daemon.

This commit is contained in:
Eelco Dolstra 2008-11-11 15:11:10 +00:00
parent 4166b11a53
commit 96598e7b06
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstore/remote-store.cc
View File

@ -183,6 +183,8 @@ void RemoteStore::setOptions()
writeInt(maxSilentTime, to); writeInt(maxSilentTime, to);
if (GET_PROTOCOL_MINOR(daemonVersion) >= 2) if (GET_PROTOCOL_MINOR(daemonVersion) >= 2)
writeInt(useBuildHook, to); writeInt(useBuildHook, to);
if (GET_PROTOCOL_MINOR(daemonVersion) >= 4)
writeInt(buildVerbosity, to);
processStderr(); processStderr();
} }

2
src/libstore/worker-protocol.hh
View File

@ -8,7 +8,7 @@ namespace nix {
#define WORKER_MAGIC_1 0x6e697863 #define WORKER_MAGIC_1 0x6e697863
#define WORKER_MAGIC_2 0x6478696f #define WORKER_MAGIC_2 0x6478696f
#define PROTOCOL_VERSION 0x103 #define PROTOCOL_VERSION 0x104
#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00) #define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff) #define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)

2
src/nix-worker/nix-worker.cc
View File

@ -426,6 +426,8 @@ static void performOp(unsigned int clientVersion,
maxSilentTime = readInt(from); maxSilentTime = readInt(from);
if (GET_PROTOCOL_MINOR(clientVersion) >= 2) if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
useBuildHook = readInt(from) != 0; useBuildHook = readInt(from) != 0;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4)
buildVerbosity = (Verbosity) readInt(from);
startWork(); startWork();
stopWork(); stopWork();
break; break;