From a4fb3876f00e41603cbd5484b8445880086a19c4 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 18 Feb 2009 12:36:50 +0000
Subject: follow urpmi pratice and use more similar data structure: there can
 be only one key id per medium, so just store it instead of using a dummy hash
 table

---
 perl-install/install/media.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/install/media.pm')

diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 08337f757..2b6a044f1 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -30,7 +30,7 @@ use urpm::download;
 #-	fakemedium ("$name ($rpmsdir)", used locally by urpmi)
 #-	rel_hdlist
 #-	hdlist_size
-#-	key-ids (hashref, values are key ids)
+#-	key-ids
 #-	name (text description)
 #-	pubkey (array containing all the keys to import)
 #-	phys_medium
@@ -929,7 +929,7 @@ sub install_urpmi {
 					     my ($id, $imported) = @_;
 					     if ($id) {
 						 log::l(($imported ? "imported" : "found") . " key=$id for medium $medium->{name}");
-						 $medium->{'key-ids'}{$id} = undef;
+						 $medium->{'key-ids'} = $id;
 					     }
 					 });
 	unlink $medium->{pubkey};
@@ -967,8 +967,8 @@ sub install_urpmi {
 	    #- output new urpmi.cfg format here.
 	    push @cfg, map { "$_\n" } 
 	      "$qname $qdir {", 
-		if_(keys(%{$medium->{'key-ids'}}), 
-	      "  key-ids: " . join(',', keys %{$medium->{'key-ids'}})),
+		if_($medium->{'key-ids'},
+	      "  key-ids: " . $medium->{'key-ids'}),
 		if_($removable_device, 
 	      "  removable: $removable_device"),
 		if_($medium->{update},
-- 
cgit v1.2.1