summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-23 19:21:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-23 19:21:37 +0000
commitd109605c948a028444901a85cc85a8e67be23e61 (patch)
tree9afc7d717de1a3feec285c62b03a74f1cec5ddcc /urpm
parent6f355ad0464b6497b1e2edc5236ed295b54db212 (diff)
downloadurpmi-d109605c948a028444901a85cc85a8e67be23e61.tar
urpmi-d109605c948a028444901a85cc85a8e67be23e61.tar.gz
urpmi-d109605c948a028444901a85cc85a8e67be23e61.tar.bz2
urpmi-d109605c948a028444901a85cc85a8e67be23e61.tar.xz
urpmi-d109605c948a028444901a85cc85a8e67be23e61.zip
simplify ("list" is not used anymore)
Diffstat (limited to 'urpm')
-rw-r--r--urpm/media.pm14
1 files changed, 7 insertions, 7 deletions
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);
}
}