diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-03-15 13:36:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-03-15 13:36:49 +0000 |
| commit | 743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847 (patch) | |
| tree | 988e4c450d95c33e7b50639b0785a3b1d4b9990a | |
| parent | 1a89f0bda9a72fce1076000c8ad5c1d8680f7faa (diff) | |
| download | urpmi-743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847.tar urpmi-743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847.tar.gz urpmi-743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847.tar.bz2 urpmi-743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847.tar.xz urpmi-743f9078db9e8c1ae4b5cf744a4c38f1cbe5e847.zip | |
fix bug introduced together with _parse_rshp_output()
| -rw-r--r-- | urpm/parallel_ka_run.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index e8b81074..a41500e4 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -62,7 +62,7 @@ sub parallel_find_remove { open my $fh, "$rshp_command -v $parallel->{options} -- urpme --no-locales --auto $test" . join(' ', map { "'$_'" } @$l) . " 2>&1 |"; while (<$fh>) { chomp; - ($_, $node) = _parse_rshp_output($_) or next; + ($node, $_) = _parse_rshp_output($_) or next; /^\s*$/ and next; /Checking to remove the following packages/ and next; /To satisfy dependencies, the following packages are going to be removed/ @@ -177,7 +177,7 @@ sub parallel_resolve_dependencies { open my $fh, "$rshp_command -v $parallel->{options} -- urpmq --synthesis $synthesis -fduc $line " . join(' ', keys %chosen) . " |"; while (<$fh>) { chomp; - ($_, $node) = _parse_rshp_output($_) or next; + ($node, $_) = _parse_rshp_output($_) or next; if (my ($action, $what) = /^\@([^\@]*)\@(.*)/) { if ($action eq 'removing') { $state->{rejected}{$what}{removed} = 1; @@ -227,7 +227,7 @@ sub parallel_install { open my $fh, "$rshp_command -v $parallel->{options} -- urpmi --pre-clean --no-locales --test --no-verify-rpm --auto --synthesis $parallel->{synthesis} $parallel->{line} |"; while (<$fh>) { chomp; - ($_, $node) = _parse_rshp_output($_) or next; + ($node, $_) = _parse_rshp_output($_) or next; /^\s*$/ and next; $bad_nodes{$node} .= $_; /Installation failed/ and $bad_nodes{$node} = ''; |