eisfunke/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix -j and other flags when using the daemon

Browse source
This commit is contained in:
Eelco Dolstra 2014-03-17 17:35:11 +01:00
parent 77e2cc6c8e
commit f93e97517e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix-daemon/nix-daemon.cc
View file

@ -537,10 +537,10 @@ static void performOp(bool trusted, unsigned int clientVersion,
case wopSetOptions: { case wopSetOptions: {
settings.keepFailed = readInt(from) != 0; settings.keepFailed = readInt(from) != 0;
settings.keepGoing = readInt(from) != 0; settings.keepGoing = readInt(from) != 0;
settings.tryFallback = readInt(from) != 0; settings.set("build-fallback", readInt(from) ? "true" : "false");
verbosity = (Verbosity) readInt(from); verbosity = (Verbosity) readInt(from);
settings.maxBuildJobs = readInt(from); settings.set("build-max-jobs", int2String(readInt(from)));
settings.maxSilentTime = readInt(from); settings.set("build-max-silent-time", int2String(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 2) if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
settings.useBuildHook = readInt(from) != 0; settings.useBuildHook = readInt(from) != 0;
if (GET_PROTOCOL_MINOR(clientVersion) >= 4) { if (GET_PROTOCOL_MINOR(clientVersion) >= 4) {
@ -549,9 +549,9 @@ static void performOp(bool trusted, unsigned int clientVersion,
settings.printBuildTrace = readInt(from) != 0; settings.printBuildTrace = readInt(from) != 0;
} }
if (GET_PROTOCOL_MINOR(clientVersion) >= 6) if (GET_PROTOCOL_MINOR(clientVersion) >= 6)
settings.buildCores = readInt(from); settings.set("build-cores", int2String(readInt(from)));
if (GET_PROTOCOL_MINOR(clientVersion) >= 10) if (GET_PROTOCOL_MINOR(clientVersion) >= 10)
settings.useSubstitutes = readInt(from) != 0; settings.set("build-use-substitutes", readInt(from) ? "true" : "false");
if (GET_PROTOCOL_MINOR(clientVersion) >= 12) { if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
unsigned int n = readInt(from); unsigned int n = readInt(from);
for (unsigned int i = 0; i < n; i++) { for (unsigned int i = 0; i < n; i++) {
@ -562,8 +562,8 @@ static void performOp(bool trusted, unsigned int clientVersion,
else else
settings.set(trusted ? name : "untrusted-" + name, value); settings.set(trusted ? name : "untrusted-" + name, value);
} }
settings.update();
} }
settings.update();
startWork(); startWork();
stopWork(); stopWork();
break; break;