From 19f17d5edb7853b8c6ca620efb3f92a6091b540a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 4 Oct 2012 14:41:56 +0000 Subject: (_simple_resolve_dependencies) fix urpmq --whatrequires regression introduced in 7.8.2 (#7706) as well as similar issue in urpmi --parallel issue introduced in commit r6067 on 2012-09-26: "simplify" --- NEWS | 2 ++ urpm/parallel.pm | 2 +- urpmq | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 21ce9237..d6bdde9a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- fix urpmq --whatrequires regression introduced in 7.8.2 (#7706) + Version 7.8.2 - 26 September 2012 - adapt to URPM-4.15 diff --git a/urpm/parallel.pm b/urpm/parallel.pm index 4458ec87..6f55b841 100644 --- a/urpm/parallel.pm +++ b/urpm/parallel.pm @@ -235,7 +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($_); + my @packages = $urpm->find_candidate_packages_($_); foreach (@packages) { my ($best_requested, $best); foreach (@$_) { diff --git a/urpmq b/urpmq index 80993c10..bee492d1 100755 --- a/urpmq +++ b/urpmq @@ -313,7 +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. - foreach ($urpm->find_candidate_packages($dep)) { + foreach ($urpm->find_candidate_packages_($dep)) { my ($best_requested, $best); foreach (@$_) { if ($best_requested || exists $requested{$_->id}) { -- cgit v1.2.1