From 9ac05e0b3ffa3efbcba290ae9fe1eb2f12a1674e Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 10 Jul 2008 14:12:45 +0000 Subject: urpm_popen: fix exit condition --- urpm/parallel_ka_run.pm | 2 +- urpm/parallel_ssh.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index a51afe58..c6dfd465 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -53,7 +53,7 @@ sub urpm_popen { my ($node, $s_) = _parse_rshp_output($s) or next; $urpm->{debug}("parallel_ka_run: $node: received: $s_") if $urpm->{debug}; - $do->($node, $s_) or last; + $do->($node, $s_) and last; } close $fh or $urpm->{fatal}(1, N("rshp failed, maybe a node is unreacheable")); } diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index b2716e37..e8d99f0a 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -80,7 +80,7 @@ sub urpm_popen { while (my $s = <$fh>) { chomp $s; $urpm->{debug}("parallel_ssh: $node: received: $s") if $urpm->{debug}; - $do->($node, $s) or last; + $do->($node, $s) and last; } close $fh or $urpm->{fatal}(1, N("host %s does not have a good version of urpmi (%d)", $node, $? >> 8)); } -- cgit v1.2.1