aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--URPM/Resolve.pm2
2 files changed, 3 insertions, 1 deletions
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;