diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:48:59 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:48:59 +0000 |
commit | ea5335c7ebe108883338f8ae348948895790ea4f (patch) | |
tree | f7b2b01b17f584bd36d9429476211b2262626a41 | |
parent | 252a346cbf6ab008d766fc91992f7d3c1fddd3f1 (diff) | |
download | urpmi-ea5335c7ebe108883338f8ae348948895790ea4f.tar urpmi-ea5335c7ebe108883338f8ae348948895790ea4f.tar.gz urpmi-ea5335c7ebe108883338f8ae348948895790ea4f.tar.bz2 urpmi-ea5335c7ebe108883338f8ae348948895790ea4f.tar.xz urpmi-ea5335c7ebe108883338f8ae348948895790ea4f.zip |
cleanup
-rw-r--r-- | urpm/parallel_ka_run.pm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 93b1d959..214974d7 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -107,17 +107,16 @@ 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. delete $state->{selected}; #- now try an iteration of urpmq. open my $fh, rshp_command($urpm, $parallel, "-v", "urpmq --synthesis $synthesis -fduc $line " . join(' ', keys %chosen)) . " |"; - while (<$fh>) { - chomp; - (my $node, $_) = _parse_rshp_output($_) or next; - urpm::parallel::parse_urpmq_output($urpm, $state, $node, $_, \$cont, \%chosen, %options); + while (my $s = <$fh>) { + chomp $s; + my ($node, $s_) = _parse_rshp_output($s) or next; + urpm::parallel::parse_urpmq_output($urpm, $state, $node, $s_, \$cont, \%chosen, %options); } close $fh or $urpm->{fatal}(1, N("rshp failed, maybe a node is unreacheable")); #- check for internal error of resolution. |