about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2009-03-28T16·12+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2009-03-28T16·12+0000
commit7fb548aa2621375559f980b4627955dbc6fe9914 (patch)
tree202283669f13ecac8d5fa8fc8661f7f933241f93
parentf54e800366b3c8540c60f0a35c407ad701e2f622 (diff)
* Clean up the output a bit.
-rwxr-xr-xscripts/build-remote.pl.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in
index 53ad8fa20fe6..1c4f97440636 100755
--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -134,7 +134,7 @@ if ($x ne "okay") {
 
 # Do the actual job.
 my $hostName = $machine->{hostName};
-print "BUILDING REMOTE: $drvPath on $hostName\n";
+print STDERR "building `$drvPath' on `$hostName'\n";
 
 # Make sure that we don't get any SSH passphrase or host key popups -
 # if there is any problem it should fail, not do something
@@ -175,7 +175,7 @@ $inputs =~ s/\n/ /g;
 my $outputs = `cat outputs`; die if ($? != 0);
 $outputs =~ s/\n/ /g;
 
-print "COPYING INPUTS...\n";
+print "copying inputs...\n";
 
 my $maybeSign = "";
 $maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec";
@@ -183,7 +183,7 @@ $maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec";
 system("NIX_SSHOPTS=\"$sshOpts\" nix-copy-closure --gzip $hostName $maybeSign $drvPath $inputs") == 0
     or die "cannot copy inputs to $hostName: $?";
 
-print "BUILDING...\n";
+print "building...\n";
 
 my $buildFlags = "--max-silent-time $maxSilentTime";
 
@@ -199,11 +199,11 @@ if (system("ssh -tt $sshOpts $hostName 'nix-store --realise -K $buildFlags $drvP
     # code 100.  It's important to distinguish between the two because
     # the first is a transient failure and the latter is permanent.
     my $res = $? == -1 || ($? >> 8) == 255 ? 1 : 100;
-    print STDERR "remote build on $hostName failed: $?";
+    print STDERR "build of `$drvPath' on `$hostName' failed with exit code $?\n";
     exit $res;
 }
 
-print "REMOTE BUILD DONE: $drvPath on $hostName\n";
+print "build of `$drvPath' on `$hostName' succeeded\n";
 
 foreach my $output (split '\n', $outputs) {
     my $maybeSignRemote = "";