From 1a13dfee64dc7f126ba1858d3198467fed5f1eef Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Wed, 26 Sep 2012 19:12:36 +0000 Subject: simplify --- urpm/parallel.pm | 3 +-- urpmq | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 13f748e5..c6ec96f4 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -235,8 +235,7 @@ sub _simple_resolve_dependencies { foreach (keys %$requested) { if (/\|/) { #- taken from URPM::Resolve to filter out choices, not complete though. - my $packages = $urpm->find_candidate_packages($_); - foreach (values %$packages) { + foreach ($urpm->find_candidate_packages_($_)) { my ($best_requested, $best); foreach (@$_) { exists $state->{selected}{$_->id} and $best_requested = $_, last; diff --git a/urpmq b/urpmq index 91309582..bee492d1 100755 --- a/urpmq +++ b/urpmq @@ -313,8 +313,7 @@ if ($options{list_aliases}) { #- finally conflicts that will force a new upgrade or a remove. while (defined ($dep = shift @properties)) { #- take the best package for each choices of same name. - my $packages = $urpm->find_candidate_packages($dep); - foreach (values %$packages) { + foreach ($urpm->find_candidate_packages_($dep)) { my ($best_requested, $best); foreach (@$_) { if ($best_requested || exists $requested{$_->id}) { -- cgit v1.2.1