From d109605c948a028444901a85cc85a8e67be23e61 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Sat, 23 Feb 2008 19:21:37 +0000 Subject: simplify ("list" is not used anymore) --- urpm/media.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'urpm') diff --git a/urpm/media.pm b/urpm/media.pm index 82fd1e2f..4ac3db81 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1053,16 +1053,16 @@ sub _copy_media_info_file { -s $result_file && $result_file; } -sub _get_list_or_pubkey__local { - my ($urpm, $medium, $name) = @_; +sub _get_pubkey__local { + my ($urpm, $medium) = @_; - _copy_media_info_file($urpm, $medium, $name, ''); + _copy_media_info_file($urpm, $medium, 'pubkey', ''); } -sub _download_list_or_pubkey { - my ($urpm, $medium, $name) = @_; +sub _download_pubkey { + my ($urpm, $medium) = @_; - _download_media_info_file($urpm, $medium, $name, '', 1); + _download_media_info_file($urpm, $medium, 'pubkey', '', 1); } sub _download_media_info_file { @@ -1373,7 +1373,7 @@ sub _get_pubkey_and_descriptions { #- examine if a pubkey file is available. if (!$nopubkey && !$medium->{'key-ids'}) { - ($local ? \&_get_list_or_pubkey__local : \&_download_list_or_pubkey)->($urpm, $medium, 'pubkey'); + ($local ? \&_get_pubkey__local : \&_download_pubkey)->($urpm, $medium); } } -- cgit v1.2.1