diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-26 20:20:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-26 20:20:33 +0000 |
| commit | d37d61ba24a165394d3c56160824b96851667c47 (patch) | |
| tree | 46c21779e161fa9e997180379b86d4927ac2b925 | |
| parent | ae6e4c1d456cf490d0960e50b90eb762944814b2 (diff) | |
| download | urpmi-d37d61ba24a165394d3c56160824b96851667c47.tar urpmi-d37d61ba24a165394d3c56160824b96851667c47.tar.gz urpmi-d37d61ba24a165394d3c56160824b96851667c47.tar.bz2 urpmi-d37d61ba24a165394d3c56160824b96851667c47.tar.xz urpmi-d37d61ba24a165394d3c56160824b96851667c47.zip | |
(selected2local_and_blists) prevent having duplicate packages in blists
(thus fixing downloading twice noarch packages on x86_64 with
--download-all (mga#4867))
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm/get_pkgs.pm | 7 |
2 files changed, 7 insertions, 1 deletions
@@ -1,4 +1,5 @@ - fix a debug message +- fix downloading twice noarch packages on x86_64 with --download-all (mga#4867) - gurpmi: o install perl-{Glib,Gtk2} as priority upgrades prior to restart (mga#5066) - updated translations diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm index 5887d3dd..5c69a525 100644 --- a/urpm/get_pkgs.pm +++ b/urpm/get_pkgs.pm @@ -108,6 +108,7 @@ sub selected2local_and_blists { my @remaining_ids = sort { $a <=> $b } keys %id_map; + my %blists; my @blists = map { my $medium = $_; my %pkgs; @@ -117,8 +118,12 @@ 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{$id_map{$id}} = $pkg; + $pkgs{$maped_id} = $pkg; } } %pkgs ? { medium => $medium, pkgs => \%pkgs } : (); |