mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build-remote.pl: Fix build log

Browse source
This commit is contained in:
Eelco Dolstra 2014-07-12 00:09:43 +02:00
parent 838138c5c4
commit a00a98548e
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
perl/lib/Nix/SSH.pm
View file

@ -107,11 +107,13 @@ sub writeStrings {
sub connectToRemoteNix { sub connectToRemoteNix {
my ($sshHost, $sshOpts) = @_; my ($sshHost, $sshOpts, $extraFlags) = @_;
$extraFlags ||= "";
# Start ‘nix-store --serve’ on the remote host. # Start ‘nix-store --serve’ on the remote host.
my ($from, $to); my ($from, $to);
my $pid = open2($from, $to, "ssh $sshHost @{$sshOpts} nix-store --serve --write"); my $pid = open2($from, $to, "ssh $sshHost @{$sshOpts} nix-store --serve --write $extraFlags");
# Do the handshake. # Do the handshake.
my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME my $SERVE_MAGIC_1 = 0x390c9deb; # FIXME

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

@ -197,7 +197,7 @@ REQ: while (1) {
@sshOpts = ("-i", $machine->{sshKeys}, "-x"); @sshOpts = ("-i", $machine->{sshKeys}, "-x");
$hostName = $machine->{hostName}; $hostName = $machine->{hostName};
eval { eval {
($from, $to) = connectToRemoteNix($hostName, \@sshOpts); ($from, $to) = connectToRemoteNix($hostName, \@sshOpts, "2>&4");
# FIXME: check if builds are inhibited. # FIXME: check if builds are inhibited.
}; };
last REQ unless $@; last REQ unless $@;