From 0aec00b1fb8246ef5e41668783891e2ebca28e98 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 22 Feb 2012 19:24:29 +0000
Subject: (find_required_package) really prefer packages from first media, thus
 fixing downloading noarch packages from 32 bit repository (mga#1603)

(backported from trunk)
---
 NEWS            | 2 ++
 URPM/Resolve.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 7fb7529..0e3d484 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
 - fix slow matching of individual regexes for skipping dependencies by creating
   a large regex to match them all at once (mdv#61389, Shlomi Fish)
+- really prefer packages from first media, thus fixing downloading noarch
+  packages from 32 bit repository (mga#1603)
 - support kernel 3.x in kmod resolution
 
 Version 3.38.1 - 16 November 2010
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index ee65ff6..5404cc0 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -212,7 +212,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;
-- 
cgit v1.2.1