From fb515b65ba73b363001d7cdccb3027bd7e0debfe Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Fri, 30 Jan 2009 10:37:46 +0000
Subject: rename 'key_ids' as 'key-ids' (so that urpmi code can check
 signatures)

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

diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index 143d6313a..a442b5ebf 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -29,7 +29,7 @@ use urpm::download;
 #-	end (last rpm id, undefined iff not selected)
 #-	fakemedium ("$name ($rpmsdir)", used locally by urpmi)
 #-	rel_hdlist
-#-	key_ids (hashref, values are key ids)
+#-	'key-ids' (hashref, values are key ids)
 #-	name (text description)
 #-	pubkey (array containing all the keys to import)
 #-	phys_medium
@@ -890,7 +890,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};
@@ -930,8 +930,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