aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-06-27 18:49:01 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-27 19:11:13 +0200
commit9a645910e2160677b5e919fb54d67027e9d9e67e (patch)
tree9fce377bb73393d4b52e8ae23ddc07c22bb37420
parent235d51620b64f77632a697c0c93ba8a152cfaadd (diff)
downloadrpmdrake-9a645910e2160677b5e919fb54d67027e9d9e67e.tar
rpmdrake-9a645910e2160677b5e919fb54d67027e9d9e67e.tar.gz
rpmdrake-9a645910e2160677b5e919fb54d67027e9d9e67e.tar.bz2
rpmdrake-9a645910e2160677b5e919fb54d67027e9d9e67e.tar.xz
rpmdrake-9a645910e2160677b5e919fb54d67027e9d9e67e.zip
keep only latest package per medium, not globally (mga#12766)
Conflicts: NEWS
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/pkg.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 05b3938c..f6504700 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
- revert commit dc9950451a6c83815e2f680f9eaba6da31a18300
+- rpmdrake:
+ o keep only latest package per medium, not globally (mga#12766)
Version 6.10.1 - 26 June 2014, Thierry Vignaud
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index e9229b86..3d80d269 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -523,7 +523,7 @@ sub get_pkgs {
foreach my $pkg (@{$urpm->{depslist}}) {
update_pbar($gurpm);
$pkg->flag_upgrade or next;
- my $key = $pkg->name . $pkg->arch;
+ my $key = pkg2medium($pkg, $urpm) . $pkg->name . $pkg->arch;
$l{$key} = $pkg if !$l{$key} || $l{$key}->compare($pkg);
}
my @installable_pkgs = map { my $n = $_->fullname; $all_pkgs{$n} = { pkg => $_ }; $n } values %l;