diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-02-22 19:24:29 +0000 |
| commit | 0aec00b1fb8246ef5e41668783891e2ebca28e98 (patch) | |
| tree | 44e66862e8e9e1deb9244f03bed7f01607365395 | |
| parent | 93c4b32d370f87daf6af733b89652765408fa819 (diff) | |
| download | perl-URPM-0aec00b1fb8246ef5e41668783891e2ebca28e98.tar perl-URPM-0aec00b1fb8246ef5e41668783891e2ebca28e98.tar.gz perl-URPM-0aec00b1fb8246ef5e41668783891e2ebca28e98.tar.bz2 perl-URPM-0aec00b1fb8246ef5e41668783891e2ebca28e98.tar.xz perl-URPM-0aec00b1fb8246ef5e41668783891e2ebca28e98.zip | |
(find_required_package) really prefer packages from first media, thus
fixing downloading noarch packages from 32 bit repository (mga#1603)
(backported from trunk)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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; |