[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
89/376: build-remote.pl: Be less verbose on failing builds
From: |
Ludovic Courtès |
Subject: |
89/376: build-remote.pl: Be less verbose on failing builds |
Date: |
Wed, 28 Jan 2015 22:04:14 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit 62309a2c56206821370b87285fcacacba1cb3566
Author: Eelco Dolstra <address@hidden>
Date: Thu Jul 24 12:43:59 2014 +0200
build-remote.pl: Be less verbose on failing builds
---
scripts/build-remote.pl.in | 3 ++-
src/nix-store/nix-store.cc | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index c2f1fec..337374c 100755
--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -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;
}
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 42012f2..f874ffe 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -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;
}
- 78/376: Pass -pthread only for programs that need it, (continued)
- 78/376: Pass -pthread only for programs that need it, Ludovic Courtès, 2015/01/28
- 80/376: Remove some dead code, Ludovic Courtès, 2015/01/28
- 72/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 81/376: Add some assertions, Ludovic Courtès, 2015/01/28
- 82/376: More debugging, Ludovic Courtès, 2015/01/28
- 85/376: tests/remote-builds.nix: Don't try cache.nixos.org, Ludovic Courtès, 2015/01/28
- 79/376: Remove some obsolete files, Ludovic Courtès, 2015/01/28
- 83/376: Fix bogus pass by reference, Ludovic Courtès, 2015/01/28
- 88/376: Refactor, Ludovic Courtès, 2015/01/28
- 87/376: tests/remote-builds.nix: Test failing build, Ludovic Courtès, 2015/01/28
- 89/376: build-remote.pl: Be less verbose on failing builds,
Ludovic Courtès <=
- 86/376: nix-store --serve: Only monitor stdin during builds, Ludovic Courtès, 2015/01/28
- 77/376: nix-daemon: Less verbosity, Ludovic Courtès, 2015/01/28
- 74/376: nix-daemon: Use a thread instead of SIGPOLL to catch client disconnects, Ludovic Courtès, 2015/01/28
- 99/376: install-nix-from-closure.sh: Install cacert, Ludovic Courtès, 2015/01/28
- 93/376: nix-copy-closure: Implement --gzip via ssh's -C flag, Ludovic Courtès, 2015/01/28
- 91/376: Remove obsolete SSH master connection code, Ludovic Courtès, 2015/01/28
- 100/376: Rename nixPath to __nixPath, Ludovic Courtès, 2015/01/28
- 95/376: Change the default for use-ssh-substituter to ‘true’, Ludovic Courtès, 2015/01/28
- 90/376: Implement nix-copy-closure --from via nix-store --serve, Ludovic Courtès, 2015/01/28
- 97/376: Remove outdated AUTHORS file, Ludovic Courtès, 2015/01/28