picnoir/Nix
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity

build-remote.pl: Be less verbose on failing builds

Browse source
This commit is contained in:
Eelco Dolstra 2014-07-24 12:43:59 +02:00
parent 56131a2709
commit 62309a2c56
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/build-remote.pl.in
View file

@ -263,7 +263,8 @@ if ($res != 0) {
# or a temporary Nix problem). We propagate this to the caller to
# allow it to distinguish between transient and permanent
# failures.
print STDERR "build of `$drvPath' on `$hostName' failed with exit code $res\n";
my $msg = readString($from);
print STDERR "error: $msg (on `$hostName')\n";
exit $res;
}

8
src/nix-store/nix-store.cc
View file

@ -1013,15 +1013,15 @@ static void opServe(Strings opFlags, Strings opArgs)
settings.maxSilentTime = readInt(in);
settings.buildTimeout = readInt(in);
int res = 0;
try {
MonitorFdHup monitor(in.fd);
store->buildPaths(paths);
writeInt(0, out);
} catch (Error & e) {
printMsg(lvlError, format("error: %1%") % e.msg());
res = e.status;
assert(e.status);
writeInt(e.status, out);
writeString(e.msg(), out);
}
writeInt(res, out);
break;
}