lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

build-remote.pl: Move "building ..." message to a better place

Browse source
This commit is contained in:
Eelco Dolstra 2013-07-11 17:16:45 +02:00
parent ed09d0c0a4
commit 6fcc290619
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,7 +213,6 @@ my @inputs = split /\s/, readline(STDIN);
my @outputs = split /\s/, readline(STDIN); my @outputs = split /\s/, readline(STDIN);
print STDERR "building `$drvPath' on `$hostName'\n";
print STDERR "@ build-remote $drvPath $hostName\n" if $printBuildTrace; print STDERR "@ build-remote $drvPath $hostName\n" if $printBuildTrace;
@ -272,6 +271,7 @@ my $buildFlags =
# is interrupted unless the `-tt' flag is used to force a pseudo-tty, # is interrupted unless the `-tt' flag is used to force a pseudo-tty,
# in which case every child receives SIGHUP; however, `-tt' doesn't # in which case every child receives SIGHUP; however, `-tt' doesn't
# work on some platforms when connection sharing is used.) # work on some platforms when connection sharing is used.)
print STDERR "building `$drvPath' on `$hostName'\n";
pipe STDIN, DUMMY; # make sure we have a readable STDIN pipe STDIN, DUMMY; # make sure we have a readable STDIN
if (system("exec ssh $hostName @sshOpts '(read; kill -INT -\$\$) <&0 & exec nix-store -r $drvPath $buildFlags > /dev/null' 2>&4") != 0) { if (system("exec ssh $hostName @sshOpts '(read; kill -INT -\$\$) <&0 & exec nix-store -r $drvPath $buildFlags > /dev/null' 2>&4") != 0) {
# Note that if we get exit code 100 from `nix-store -r', it # Note that if we get exit code 100 from `nix-store -r', it