summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 12:34:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 12:34:10 +0000
commite1760fe9e8eb3ac1ba8a89d205a75638a9093c3e (patch)
tree23c7fd94198726dd017b447c225e585ee7a0147b /urpm.pm
parentbade0a0d4270471284685b1fa9e47ea79ad9f9a0 (diff)
downloadurpmi-e1760fe9e8eb3ac1ba8a89d205a75638a9093c3e.tar
urpmi-e1760fe9e8eb3ac1ba8a89d205a75638a9093c3e.tar.gz
urpmi-e1760fe9e8eb3ac1ba8a89d205a75638a9093c3e.tar.bz2
urpmi-e1760fe9e8eb3ac1ba8a89d205a75638a9093c3e.tar.xz
urpmi-e1760fe9e8eb3ac1ba8a89d205a75638a9093c3e.zip
adapt function names to pubkey and descriptions being done later
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm.pm b/urpm.pm
index dc67ffdd..12471ca1 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1445,7 +1445,7 @@ sub _read_rpms_from_dir {
}
#- options: callback, force, force_building_hdlist, nomd5sum, nopubkey, probe_with
-sub _update_medium__parse_if_unmodified__or_get_files__local {
+sub _update_medium__parse_if_unmodified__local {
my ($urpm, $medium, $second_pass, $clean_cache, $options) = @_;
my $dir = file_from_local_url($medium->{url});
@@ -1540,7 +1540,7 @@ this could happen if you mounted manually the directory when creating the medium
}
#- options: callback, force, nomd5sum, nopubkey, probe_with, quiet
-sub _update_medium__parse_if_unmodified__or_get_files__remote {
+sub _update_medium__parse_if_unmodified__remote {
my ($urpm, $medium, $options) = @_;
my ($retrieved_md5sum, $basename);
@@ -1691,7 +1691,7 @@ sub _write_rpm_list {
}
#- options: callback, force, force_building_hdlist, nomd5sum, probe_with, quiet
-#- (from _update_medium__parse_if_unmodified__or_get_files__local and _update_medium__parse_if_unmodified__or_get_files__remote)
+#- (from _update_medium__parse_if_unmodified__local and _update_medium__parse_if_unmodified__remote)
sub _update_medium_first_pass {
my ($urpm, $medium, $second_pass, $clean_cache, %options) = @_;
@@ -1721,8 +1721,8 @@ sub _update_medium_first_pass {
{
my $rc =
file_from_local_url($medium->{url})
- ? _update_medium__parse_if_unmodified__or_get_files__local($urpm, $medium, $second_pass, $clean_cache, \%options)
- : _update_medium__parse_if_unmodified__or_get_files__remote($urpm, $medium, \%options);
+ ? _update_medium__parse_if_unmodified__local($urpm, $medium, $second_pass, $clean_cache, \%options)
+ : _update_medium__parse_if_unmodified__remote($urpm, $medium, \%options);
if (!$rc || $rc eq 'unmodified') {
return $rc;