summaryrefslogtreecommitdiffstats
path: root/urpm/get_pkgs.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-06-08 18:50:50 +0000
committerThierry Vignaud <tv@mageia.org>2012-06-08 18:50:50 +0000
commit58779dead791a82692fe652471d0688124a18cac (patch)
treebc050edb2d6824fe84baf21b9537054e5f3e965f /urpm/get_pkgs.pm
parent34b0c13bce43796a09724d30eb90f2d6545d71d5 (diff)
downloadurpmi-58779dead791a82692fe652471d0688124a18cac.tar
urpmi-58779dead791a82692fe652471d0688124a18cac.tar.gz
urpmi-58779dead791a82692fe652471d0688124a18cac.tar.bz2
urpmi-58779dead791a82692fe652471d0688124a18cac.tar.xz
urpmi-58779dead791a82692fe652471d0688124a18cac.zip
revert commit r3849 from Mar 26 2012 as it causes a testsuite
regression: "(selected2local_and_blists) prevent having duplicate packages in blists (thus fixing downloading twice noarch packages on x86_64 with --download-all (mga#4867))"
Diffstat (limited to 'urpm/get_pkgs.pm')
-rw-r--r--urpm/get_pkgs.pm7
1 files changed, 1 insertions, 6 deletions
diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm
index a0ef4445..bde604e8 100644
--- a/urpm/get_pkgs.pm
+++ b/urpm/get_pkgs.pm
@@ -108,7 +108,6 @@ sub selected2local_and_blists {
my @remaining_ids = sort { $a <=> $b } keys %id_map;
- my %blists;
my @blists = map {
my $medium = $_;
my %pkgs;
@@ -118,12 +117,8 @@ sub selected2local_and_blists {
$medium->{start} <= $id && $id <= $medium->{end} or last;
shift @remaining_ids;
- my $maped_id = $id_map{$id};
- # no duplicate package (especially noarch ones, eg from 32 & 64 bit media):
- next if $blists{$maped_id};
- $blists{$maped_id} = 1;
my $pkg = $urpm->{depslist}[$id];
- $pkgs{$maped_id} = $pkg;
+ $pkgs{$id_map{$id}} = $pkg;
}
}
%pkgs ? { medium => $medium, pkgs => \%pkgs } : @{[]};