aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-04 16:28:51 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-04 16:28:51 +0000
commit980043751ce9b571c918736285ad455337614a29 (patch)
treee04cb69a7e7faf84f66bc1f738501ac71f1b25ae
parentac7b1a6ef0815de9b4cd4eda3d10ecb7f9c36098 (diff)
downloadperl-URPM-980043751ce9b571c918736285ad455337614a29.tar
perl-URPM-980043751ce9b571c918736285ad455337614a29.tar.gz
perl-URPM-980043751ce9b571c918736285ad455337614a29.tar.bz2
perl-URPM-980043751ce9b571c918736285ad455337614a29.tar.xz
perl-URPM-980043751ce9b571c918736285ad455337614a29.zip
(packages_providing) sort package ids before returning them
this mean prefering package from first medium when same NEVR exists in several media, thus prefering 64bit media over 32 bit ones (mga#7524) complement commit r2909 on Feb 7 2012: " (find_required_package) really prefer packages from first media, thus fixing downloading noarch packages from 32 bit repository (mga#1603)"
-rw-r--r--NEWS3
-rw-r--r--URPM.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 613d914..2fbfad8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- prefer package from first medium when same NEVR exists in several media
+ (thus prefering 64bit media over 32 bit ones) (mga#7524)
+
Version 4.20 - 3 December 2012
- fix a rare segfault
diff --git a/URPM.pm b/URPM.pm
index 3b6ea63..1929948 100644
--- a/URPM.pm
+++ b/URPM.pm
@@ -32,7 +32,7 @@ sub set_nofatal {
sub packages_providing {
my ($urpm, $name) = @_;
- grep { $_ } map { $urpm->{depslist}[$_] } keys %{$urpm->{provides}{$name} || {}};
+ grep { $_ } map { $urpm->{depslist}[$_] } sort { $a <=> $b } keys %{$urpm->{provides}{$name} || {}};
}
sub packages_obsoleting {