diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | urpm/get_pkgs.pm | 7 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,7 @@ +- urpmi + o don't confuse media/media keys when a package is available from different + media (eg CDROM/network) + Version 6.14.15 - 5 June 2009 - urpmi diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm index adf776d4..8e2a0c16 100644 --- a/urpm/get_pkgs.pm +++ b/urpm/get_pkgs.pm @@ -179,7 +179,12 @@ sub download_packages_of_distant_media { #- examine all files to know what can be indexed on multiple media. while (my ($id, $pkg) = each %{$blist->{pkgs}}) { #- the given URL is trusted, so the file can safely be ignored. - defined $sources->{$id} and next; + if (defined $sources->{$id}) { + $new_sources{$id} = [ $pkg->id, $sources->{$id} ]; + delete $sources->{$id}; + next; + } + exists $new_sources{$id} and next; if (urpm::is_local_medium($blist->{medium})) { my $local_file = file_from_local_url(urpm::blist_pkg_to_url($blist, $pkg)); |