puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Clean up the output a bit.

Browse source
This commit is contained in:
Eelco Dolstra 2009-03-28 16:12:46 +00:00
parent f54e800366
commit 7fb548aa26
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -134,7 +134,7 @@ if ($x ne "okay") {
# Do the actual job. # Do the actual job.
my $hostName = $machine->{hostName}; 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 - # 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 # 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); my $outputs = `cat outputs`; die if ($? != 0);
$outputs =~ s/\n/ /g; $outputs =~ s/\n/ /g;
print "COPYING INPUTS...\n"; print "copying inputs...\n";
my $maybeSign = ""; my $maybeSign = "";
$maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec"; $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 system("NIX_SSHOPTS=\"$sshOpts\" nix-copy-closure --gzip $hostName $maybeSign $drvPath $inputs") == 0
or die "cannot copy inputs to $hostName: $?"; or die "cannot copy inputs to $hostName: $?";
print "BUILDING...\n"; print "building...\n";
my $buildFlags = "--max-silent-time $maxSilentTime"; 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 # code 100. It's important to distinguish between the two because
# the first is a transient failure and the latter is permanent. # the first is a transient failure and the latter is permanent.
my $res = $? == -1 || ($? >> 8) == 255 ? 1 : 100; 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; exit $res;
} }
print "REMOTE BUILD DONE: $drvPath on $hostName\n"; print "build of `$drvPath' on `$hostName' succeeded\n";
foreach my $output (split '\n', $outputs) { foreach my $output (split '\n', $outputs) {
my $maybeSignRemote = ""; my $maybeSignRemote = "";