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

Fix build

Browse source
This commit is contained in:
Eelco Dolstra 2021-02-22 15:10:24 +01:00
parent 34b438ab6e
commit a7d8ee98da
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hydra-eval-jobs/hydra-eval-jobs.cc
View file

@ -37,15 +37,6 @@ struct MyArgs : MixEvalArgs, MixCommonArgs
MyArgs() : MixCommonArgs("hydra-eval-jobs") MyArgs() : MixCommonArgs("hydra-eval-jobs")
{ {
addFlag({
.longName = "help",
.description = "show usage information",
.handler = {[&]() {
printHelp(programName, std::cout);
throw Exit();
}}
});
addFlag({ addFlag({
.longName = "gc-roots-dir", .longName = "gc-roots-dir",
.description = "garbage collector roots directory", .description = "garbage collector roots directory",

6
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -97,7 +97,7 @@ void State::parseMachines(const std::string & contents)
machine->systemTypes = tokenizeString<StringSet>(tokens[1], ","); machine->systemTypes = tokenizeString<StringSet>(tokens[1], ",");
machine->sshKey = tokens[2] == "-" ? string("") : tokens[2]; machine->sshKey = tokens[2] == "-" ? string("") : tokens[2];
if (tokens[3] != "") if (tokens[3] != "")
string2Int(tokens[3], machine->maxJobs); machine->maxJobs = string2Int<decltype(machine->maxJobs)>(tokens[3]).value();
else else
machine->maxJobs = 1; machine->maxJobs = 1;
machine->speedFactor = atof(tokens[4].c_str()); machine->speedFactor = atof(tokens[4].c_str());
@ -862,7 +862,9 @@ int main(int argc, char * * argv)
else if (*arg == "--status") else if (*arg == "--status")
status = true; status = true;
else if (*arg == "--build-one") { else if (*arg == "--build-one") {
if (!string2Int<BuildID>(getArg(*arg, arg, end), buildOne)) if (auto b = string2Int<BuildID>(getArg(*arg, arg, end)))
buildOne = *b;
else
throw Error("‘--build-one’ requires a build ID"); throw Error("‘--build-one’ requires a build ID");
} else } else
return false; return false;