[PATCH] git-cvsimport.perl: Bail out right away when reading from the server fails
- From
- Fabian Keil <fk@fabiankeil.de>
- Date
- Jan 31, 2011, 19:29 UTC
- Message-ID
- <20110131202946.0a3162b3@r500.local>
If the CVS server is down, this reduced the git-cvsimport output from:
ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Use of uninitialized value $rep in scalar chomp at /usr/local/libexec/git-core/git-cvsimport line 369. Use of uninitialized value $rep in substitution (s///) at /usr/local/libexec/git-core/git-cvsimport line 370. Expected Valid-requests from server, but got: <unknown>
to the less noisy:
ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Failed to read from server at /usr/local/libexec/git-core/git-cvsimport line 370.
In this case a silent exit() instead of the die() would probably do, but I assume that there could be cases where the connection attempt succeeds, but reading from the server fails for other reasons.
Signed-off-by: Fabian Keil <fk@fabiankeil.de> --- git-cvsimport.perl | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
1d8b7c2be2b7dd281a0799735d00c8111404260f
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 8e683e5..2a76d9e 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -366,7 +366,9 @@ sub conn { $self->{'socketo'}->write("valid-requests\n"); $self->{'socketo'}->flush(); - chomp(my $rep=$self->readline()); + my $rep=$self->readline(); + die "Failed to read from server" unless defined $rep; + chomp($rep); if ($rep !~ s/^Valid-requests\s*//) { $rep="<unknown>" unless $rep; die "Expected Valid-requests from server, but got: $rep\n";
-- 1.7.3.5