summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-26 19:12:48 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-26 19:12:48 +0000
commit463ae8dd3011f9bf3014f92edc17af4250ba8d66 (patch)
tree5e5b4c03e3240234c95395f0a2b9eac9acd4f6c2
parent00f909e65833ea8ef73bf4a02b0dd8d7623636d6 (diff)
downloadurpmi-463ae8dd3011f9bf3014f92edc17af4250ba8d66.tar
urpmi-463ae8dd3011f9bf3014f92edc17af4250ba8d66.tar.gz
urpmi-463ae8dd3011f9bf3014f92edc17af4250ba8d66.tar.bz2
urpmi-463ae8dd3011f9bf3014f92edc17af4250ba8d66.tar.xz
urpmi-463ae8dd3011f9bf3014f92edc17af4250ba8d66.zip
adapt to URPM-4.15: find_candidate_packages_() => find_candidate_packages()
-rw-r--r--NEWS2
-rw-r--r--urpm/parallel.pm2
-rw-r--r--urpm/select.pm2
-rwxr-xr-xurpmq2
4 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index b608bc87..5a66a1bc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- adapt to URPM-4.15
+
Version 7.8.1 - 8 September 2012
- fix urpmq -h (mga#7390)
diff --git a/urpm/parallel.pm b/urpm/parallel.pm
index c6ec96f4..b3185267 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.
- foreach ($urpm->find_candidate_packages_($_)) {
+ foreach ($urpm->find_candidate_packages($_)) {
my ($best_requested, $best);
foreach (@$_) {
exists $state->{selected}{$_->id} and $best_requested = $_, last;
diff --git a/urpm/select.pm b/urpm/select.pm
index 0b5c7fb3..2273ffe1 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -359,7 +359,7 @@ sub select_replacepkgs {
my $db = urpm::db_open_or_die_($urpm);
foreach my $id (keys %$requested) {
- my @pkgs = $urpm->find_candidate_packages_($id);
+ my @pkgs = $urpm->find_candidate_packages($id);
if (my ($pkg) = grep { URPM::is_package_installed($db, $_) } @pkgs) {
$urpm->{debug_URPM}("selecting replacepkg " . $pkg->fullname) if $urpm->{debug_URPM};
$pkg->set_flag_requested;
diff --git a/urpmq b/urpmq
index bee492d1..80993c10 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}) {