maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build-hook: If there are no machines defined, quit permanently

Browse source
This commit is contained in:
Eelco Dolstra 2017-05-02 12:16:29 +02:00
parent 70581b6363
commit 174b68a2a2
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/build-remote/build-remote.cc
View file

@ -150,6 +150,11 @@ int main (int argc, char * * argv)
auto machines = readConf(); auto machines = readConf();
debug("got %d remote builders", machines.size()); debug("got %d remote builders", machines.size());
if (machines.empty()) {
std::cerr << "# decline-permanently\n";
return;
}
string drvPath; string drvPath;
string storeUri; string storeUri;
for (string line; getline(cin, line);) { for (string line; getline(cin, line);) {

11
src/libstore/build.cc
View file

@ -1598,8 +1598,15 @@ HookReply DerivationGoal::tryBuildHook()
debug(format("hook reply is ‘%1%’") % reply); debug(format("hook reply is ‘%1%’") % reply);
if (reply == "decline" || reply == "postpone") if (reply == "decline")
return reply == "decline" ? rpDecline : rpPostpone; return rpDecline;
else if (reply == "decline-permanently") {
settings.useBuildHook = false;
worker.hook = 0;
return rpDecline;
}
else if (reply == "postpone")
return rpPostpone;
else if (reply != "accept") else if (reply != "accept")
throw Error(format("bad hook reply ‘%1%’") % reply); throw Error(format("bad hook reply ‘%1%’") % reply);