picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Minor cleanup

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-14 13:42:22 +02:00
parent 01dcdfcf33
commit 3872371f25
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libmain/shared.cc
View file

@ -159,7 +159,7 @@ struct LegacyArgs : public MixCommonArgs
&(bool&) settings.keepGoing); &(bool&) settings.keepGoing);
mkFlag(0, "fallback", "build from source if substitution fails", []() { mkFlag(0, "fallback", "build from source if substitution fails", []() {
settings.set("build-fallback", "true"); settings.tryFallback = true;
}); });
mkFlag1('j', "max-jobs", "jobs", "maximum number of parallel builds", [=](std::string s) { mkFlag1('j', "max-jobs", "jobs", "maximum number of parallel builds", [=](std::string s) {

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

@ -440,13 +440,13 @@ static void performOp(ref<LocalStore> store, bool trusted, unsigned int clientVe
settings.keepGoing = readInt(from); settings.keepGoing = readInt(from);
settings.tryFallback = readInt(from); settings.tryFallback = readInt(from);
verbosity = (Verbosity) readInt(from); verbosity = (Verbosity) readInt(from);
settings.set("build-max-jobs", std::to_string(readInt(from))); settings.maxBuildJobs = readInt(from);
settings.maxSilentTime = readInt(from); settings.maxSilentTime = readInt(from);
settings.useBuildHook = readInt(from) != 0; settings.useBuildHook = readInt(from) != 0;
settings.verboseBuild = lvlError == (Verbosity) readInt(from); settings.verboseBuild = lvlError == (Verbosity) readInt(from);
readInt(from); // obsolete logType readInt(from); // obsolete logType
readInt(from); // obsolete printBuildTrace readInt(from); // obsolete printBuildTrace
settings.set("build-cores", std::to_string(readInt(from))); settings.buildCores = readInt(from);
settings.useSubstitutes = readInt(from); settings.useSubstitutes = readInt(from);
if (GET_PROTOCOL_MINOR(clientVersion) >= 12) { if (GET_PROTOCOL_MINOR(clientVersion) >= 12) {
unsigned int n = readInt(from); unsigned int n = readInt(from);