diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-27 11:05:39 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-27 11:05:39 +0000 |
| commit | 4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3 (patch) | |
| tree | f1606fa0714357c3dffd2228a2e063fe4dc35cf6 | |
| parent | b556b18d92f9e34bd0e41b7627873e984fb357c7 (diff) | |
| download | urpmi-4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3.tar urpmi-4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3.tar.gz urpmi-4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3.tar.bz2 urpmi-4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3.tar.xz urpmi-4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3.zip | |
(_simple_resolve_dependencies) further simplify, fixing previous commit
| -rw-r--r-- | urpm/parallel.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm/parallel.pm b/urpm/parallel.pm index b3185267..4458ec87 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -235,7 +235,8 @@ sub _simple_resolve_dependencies { foreach (keys %$requested) { if (/\|/) { #- taken from URPM::Resolve to filter out choices, not complete though. - foreach ($urpm->find_candidate_packages($_)) { + my @packages = $urpm->find_candidate_packages($_); + foreach (@packages) { my ($best_requested, $best); foreach (@$_) { exists $state->{selected}{$_->id} and $best_requested = $_, last; @@ -254,7 +255,7 @@ sub _simple_resolve_dependencies { $_ = $best_requested || $best; } #- simplified choice resolution. - my $choice = $options{callback_choices}->($urpm, undef, $state, [ values %$packages ]); + my $choice = $options{callback_choices}->($urpm, undef, $state, \@packages); if ($choice) { push @pkgs, $choice; } |