diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/get_pkgs.pm | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -5,6 +5,8 @@ Version 6.35 - 23 April 2010 -urpmi: o when using --update, allow package dependencies to be fetched from non-update media (#51268) + o don't confuse media/media keys when a package is available from different + media (eg CDROM/network) Version 6.34 - 25 January 2010 diff --git a/urpm/get_pkgs.pm b/urpm/get_pkgs.pm index 635df9c9..391bd152 100644 --- a/urpm/get_pkgs.pm +++ b/urpm/get_pkgs.pm @@ -203,7 +203,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)); |