aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-02-07 21:20:04 +0000
committerThierry Vignaud <tv@mageia.org>2012-02-07 21:20:04 +0000
commit53e38beae4d9638f41b219521b802a2969d68909 (patch)
tree721c31c09a5fe97206c05501917ec8b73d3953e8
parent42e10608a8d323923cc7c21ab611a55639fadaed (diff)
downloadperl-URPM-53e38beae4d9638f41b219521b802a2969d68909.tar
perl-URPM-53e38beae4d9638f41b219521b802a2969d68909.tar.gz
perl-URPM-53e38beae4d9638f41b219521b802a2969d68909.tar.bz2
perl-URPM-53e38beae4d9638f41b219521b802a2969d68909.tar.xz
perl-URPM-53e38beae4d9638f41b219521b802a2969d68909.zip
(find_required_package) really prefer packages from first media, thus
fixing downloading noarch packages from 32 bit repository (mga#1603)
-rw-r--r--NEWS2
-rw-r--r--URPM/Resolve.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 40eefd6..48cd61e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- cleanups
- fix computing size of added/freed disk space when updating involves removing
some packages (mga#4427)
+- really prefer packages from first media, thus fixing downloading noarch
+ packages from 32 bit repository (mga#1603)
Version 3.38.6 - 15 January 2012
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 494cb11..c09047a 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -213,7 +213,7 @@ sub find_required_package {
$may_add_to_packages->($pkg);
} elsif (my $name = property2name($_)) {
my $property = $_;
- foreach (keys %{$urpm->{provides}{$name} || {}}) {
+ foreach (sort {$a <=> $b} keys %{$urpm->{provides}{$name} || {}}) {
my $pkg = $urpm->{depslist}[$_];
$pkg->is_arch_compat or next;
$pkg->flag_skip || $state->{rejected}{$pkg->fullname} and next;