diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:56:01 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:56:01 +0000 |
| commit | 08a7df9ee40ebd7b24accedcfba4b8a544446b04 (patch) | |
| tree | 2b3a40e47000f8414e2042ec7b56b3e24a7da4cd | |
| parent | f23c72f2f22a4a6778498ed8bbeed1ac8776ff69 (diff) | |
| download | urpmi-08a7df9ee40ebd7b24accedcfba4b8a544446b04.tar urpmi-08a7df9ee40ebd7b24accedcfba4b8a544446b04.tar.gz urpmi-08a7df9ee40ebd7b24accedcfba4b8a544446b04.tar.bz2 urpmi-08a7df9ee40ebd7b24accedcfba4b8a544446b04.tar.xz urpmi-08a7df9ee40ebd7b24accedcfba4b8a544446b04.zip | |
cleanup
| -rw-r--r-- | urpm/parallel_ka_run.pm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 793f3d7c..16d3eb44 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -133,16 +133,15 @@ sub parallel_install { run_mput($urpm, $parallel, values %$install, values %$upgrade, "$urpm->{cachedir}/rpms/"); $? == 0 || $? == 256 or $urpm->{fatal}(1, N("mput failed, maybe a node is unreacheable")); - local $_; - my ($node, %bad_nodes); + my (%bad_nodes); open my $fh, rshp_command($urpm, $parallel, "-v", "urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line}") . ' |'; - while (<$fh>) { - chomp; - ($node, $_) = _parse_rshp_output($_) or next; - /^\s*$/ and next; - $bad_nodes{$node} .= $_; - /Installation failed/ and $bad_nodes{$node} = ''; - /Installation is possible/ and delete $bad_nodes{$node}; + while (my $s_ = <$fh>) { + chomp $s_; + my ($node, $s) = _parse_rshp_output($s_) or next; + $s =~ /^\s*$/ and next; + $bad_nodes{$node} .= $s; + $s =~ /Installation failed/ and $bad_nodes{$node} = ''; + $s =~ /Installation is possible/ and delete $bad_nodes{$node}; } close $fh or $urpm->{fatal}(1, N("rshp failed, maybe a node is unreacheable")); |