From fb1aa950f8a70e05c123a48bcab369465037cb0f Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Sun, 12 Apr 2015 20:55:47 +0200
Subject: fix upgrade when package's in several media

sort by ids (like in other places) when finding providing package, thus
fixing upgrade when the same package is offered in several media
(mga#15350)
---
 perl-install/install/NEWS    | 2 ++
 perl-install/install/pkgs.pm | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 7a7ad0858..9ef7511d2 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,6 @@
 - add kpartx for dmraid activation
+- fix upgrade when package's in several media (mga#15350)
+  (need URPM-5.06 too)
 
 Version 16.80 - 9 April 2015
 
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index fca5b6c19..04d281f35 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -126,10 +126,11 @@ sub packagesProviding {
 
 #- search package with given name and compatible with current architecture.
 #- take the best one found (most up-to-date).
+# FIXME: reuse urpmi higher level code instead!
 sub packageByName {
     my ($packages, $name) = @_;
 
-    my @l =  grep { $_->name eq $name } packagesProviding($packages, $name);
+    my @l =  sort { $b->id <=> $a->id } grep { $_->name eq $name } packagesProviding($packages, $name);
 
     my $best;
     foreach (@l) {
-- 
cgit v1.2.1