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

* Correctly handle SSH failing to establish a connection. Because

Browse source 
this didn't work right, the build hook wouldn't fall back to using
  other machines of the desired type.
This commit is contained in:
Eelco Dolstra 2010-08-24 14:27:07 +00:00
parent 034f608e00
commit 1e5f5ea2e9
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/ssh.pm
View file

@ -25,14 +25,17 @@ sub openSSHConnection {
# print "started" when it has established the connection, and wait # print "started" when it has established the connection, and wait
# until we see that. # until we see that.
open SSH, "ssh $sshHost @sshOpts -M -N -o LocalCommand='echo started' -o PermitLocalCommand=yes |" or die; open SSH, "ssh $sshHost @sshOpts -M -N -o LocalCommand='echo started' -o PermitLocalCommand=yes |" or die;
while (<SSH>) { while (<SSH>) {
chomp; chomp;
last if /started/; if ($_ eq "started") {
}
$sshStarted = 1; $sshStarted = 1;
return 1; return 1;
} }
}
return 0;
}
# Tell the master SSH client to exit. # Tell the master SSH client to exit.
sub closeSSHConnection { sub closeSSHConnection {