From 58779dead791a82692fe652471d0688124a18cac Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 8 Jun 2012 18:50:50 +0000
Subject: 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))"
---
 urpm/get_pkgs.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'urpm/get_pkgs.pm')

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 } : @{[]};
-- 
cgit v1.2.1