From 4359f78c9ac1cfed70e61c8bc8a14b5dc420cac3 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 27 Sep 2012 11:05:39 +0000 Subject: (_simple_resolve_dependencies) further simplify, fixing previous commit --- urpm/parallel.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'urpm') 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; } -- cgit v1.2.1