diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:49:41 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:49:41 +0000 |
| commit | 5e5580094b37b43afbdb1816ae772237d33fa245 (patch) | |
| tree | 6b188cfea6664c6f05d5f8d1b4f21ffce50b3edd /urpm/parallel_ssh.pm | |
| parent | ea5335c7ebe108883338f8ae348948895790ea4f (diff) | |
| download | urpmi-5e5580094b37b43afbdb1816ae772237d33fa245.tar urpmi-5e5580094b37b43afbdb1816ae772237d33fa245.tar.gz urpmi-5e5580094b37b43afbdb1816ae772237d33fa245.tar.bz2 urpmi-5e5580094b37b43afbdb1816ae772237d33fa245.tar.xz urpmi-5e5580094b37b43afbdb1816ae772237d33fa245.zip | |
cleanup
Diffstat (limited to 'urpm/parallel_ssh.pm')
| -rw-r--r-- | urpm/parallel_ssh.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/urpm/parallel_ssh.pm b/urpm/parallel_ssh.pm index 3275efcd..eb060ab1 100644 --- a/urpm/parallel_ssh.pm +++ b/urpm/parallel_ssh.pm @@ -117,7 +117,6 @@ sub parallel_resolve_dependencies { #- execute urpmq to determine packages to install. my ($cont, %chosen); - local $_; do { $cont = 0; #- prepare to stop iteration. #- the following state should be cleaned for each iteration. @@ -127,9 +126,9 @@ sub parallel_resolve_dependencies { my $command = _ssh_urpm($urpm, $node, "urpmq", _nolock($node) . "--synthesis $synthesis -fduc $line " . join(' ', keys %chosen)); open my $fh, "$command |" or $urpm->{fatal}(1, "Can't fork ssh: $!"); - while (defined ($_ = <$fh>)) { - chomp; - urpm::parallel::parse_urpmq_output($urpm, $state, $node, $_, \$cont, \%chosen, %options); + while (my $s = <$fh>) { + chomp $s; + urpm::parallel::parse_urpmq_output($urpm, $state, $node, $s, \$cont, \%chosen, %options); } close $fh or $urpm->{fatal}(1, N("host %s does not have a good version of urpmi (%d)", $node, $? >> 8)); } |