diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:43:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-07-09 21:43:35 +0000 |
| commit | 7270c2d845845ccaf97d2a1fe3c45f2f4c530913 (patch) | |
| tree | 40087a8119afbe415de6cd3fb60e5c81864a1b46 /urpm | |
| parent | af4b249aec414c25da4a3c8aa6b2337b4bfc5d20 (diff) | |
| download | urpmi-7270c2d845845ccaf97d2a1fe3c45f2f4c530913.tar urpmi-7270c2d845845ccaf97d2a1fe3c45f2f4c530913.tar.gz urpmi-7270c2d845845ccaf97d2a1fe3c45f2f4c530913.tar.bz2 urpmi-7270c2d845845ccaf97d2a1fe3c45f2f4c530913.tar.xz urpmi-7270c2d845845ccaf97d2a1fe3c45f2f4c530913.zip | |
merge changes with parallel_ssh
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/parallel_ka_run.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/urpm/parallel_ka_run.pm b/urpm/parallel_ka_run.pm index 2618b0bc..e8ae8b9c 100644 --- a/urpm/parallel_ka_run.pm +++ b/urpm/parallel_ka_run.pm @@ -127,7 +127,7 @@ sub parallel_resolve_dependencies { #- or continue iteration to make sure no more choices are left. $cont ||= 1; #- invalid transitory state (still choices is strange here if next sentence is not executed). unless (grep { exists $chosen{$_} } split /\|/, $_) { - my $choice = $options{callback_choices}->($urpm, undef, $state, [ map { $urpm->search($_) } split '\|', $_ ]); + my $choice = $options{callback_choices}->($urpm, undef, $state, [ map { $urpm->search($_) } split /\|/, $_ ]); if ($choice) { $chosen{scalar $choice->fullname} = $choice; #- it has not yet been chosen so need to ask user. @@ -138,7 +138,7 @@ sub parallel_resolve_dependencies { } } } else { - my $pkg = $urpm->search($_) or next; + my $pkg = $urpm->search($_) or next; #TODO $state->{selected}{$pkg->id}{$node} = $_; } } |