ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use latest nixUnstable

Browse Source
This commit is contained in:
Eelco Dolstra
2017-02-03 14:39:18 +01:00
parent 63d8c8d631
commit a366f362e1
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hydra-queue-runner/build-remote.cc
View File

@ -184,7 +184,7 @@ void State::buildRemote(ref<Store> destStore,
throw Error("machine ‘%1%’ does not support repeating a build; please upgrade it to Nix 1.12", machine->sshName);
} catch (EndOfFile & e) {
child.pid.wait(true);
child.pid.wait();
string s = chomp(readFile(result.logFile));
throw Error(format("cannot connect to ‘%1%’: %2%") % machine->sshName % s);
}
@ -428,7 +428,7 @@ void State::buildRemote(ref<Store> destStore,
/* Shut down the connection. */
child.to = -1;
child.pid.wait(true);
child.pid.wait();
} catch (Error & e) {
/* Disable this machine until a certain period of time has

4
src/hydra-queue-runner/hydra-queue-runner.cc
View File

@ -459,7 +459,7 @@ void State::logCompressor()
throw SysError("cannot start bzip2");
});
int res = pid.wait(true);
int res = pid.wait();
if (res != 0)
throw Error(format("bzip2 returned exit code %1% while compressing ‘%2%’")
@ -521,7 +521,7 @@ void State::notificationSender()
throw SysError("cannot start hydra-notify");
});
int res = pid.wait(true);
int res = pid.wait();
if (res != 0)
throw Error(format("hydra-build returned exit code %1% notifying about build %2%")