From ae52aba4a92db1172d66b73e7f06a0203fc0fdcd Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 28 Apr 2010 10:10:27 +0000 Subject: remember which media local packages came from It's sometimes possible that a package is available from both a local medium (CDROM) and a distant one. This causes problems when the package isn't signed with the same key (this is bad but happens on MES5 install CDs) as urpmi tends to get confused about where a package comes from and then check the package against the wrong key. Packages are assigned IDs by urpmi, and these IDs are used to figure out the package media. This ID is also used as an identifier to "recognize" identical packages coming from different media, so we need to be careful when manipulating it. In particular, we can't assign the right ID to every package right away because then this would break package downloading (we'd download packages available on local media). When processing packages to download, if we encounter a local package, we assign it the right ID. This assumes the list of media in the blist are sorted by order of relevance (ie prioritary ones first). --- NEWS | 2 ++ urpm/get_pkgs.pm | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a4e02016..ff095ea6 100644 --- a/NEWS +++ b/NEWS @@ -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)); -- cgit v1.2.1