summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-28 09:04:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-28 09:04:54 +0000
commitbf4e66523c253456e7fdf8d1efd3b0c9908b9def (patch)
tree24e82d3938efe1f9280be511cf4c7df893dbecc8
parent148076a20e8e6c8c87a79915c4da76d03a28c7fd (diff)
downloadurpmi-bf4e66523c253456e7fdf8d1efd3b0c9908b9def.tar
urpmi-bf4e66523c253456e7fdf8d1efd3b0c9908b9def.tar.gz
urpmi-bf4e66523c253456e7fdf8d1efd3b0c9908b9def.tar.bz2
urpmi-bf4e66523c253456e7fdf8d1efd3b0c9908b9def.tar.xz
urpmi-bf4e66523c253456e7fdf8d1efd3b0c9908b9def.zip
we don't need to pass $hdlist_or to _read_existing_synthesis_and_hdlist_if_same_time_and_msize() anymore :)
-rw-r--r--urpm/media.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index e7da7f35..b21e292e 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -962,12 +962,12 @@ sub generate_medium_names {
sub _read_existing_synthesis_and_hdlist_if_same_time_and_msize {
- my ($urpm, $medium, $hdlist_or) = @_;
+ my ($urpm, $medium) = @_;
- same_size_and_mtime($hdlist_or,
+ same_size_and_mtime(cachedir_with_hdlist($urpm, $medium),
statedir_hdlist($urpm, $medium)) or return;
- unlink $hdlist_or;
+ unlink cachedir_with_hdlist($urpm, $medium);
_read_existing_synthesis_and_hdlist($urpm, $medium);
@@ -1332,7 +1332,7 @@ this could happen if you mounted manually the directory when creating the medium
#- check if the files are equal... and no force copy...
if (!$options->{force}) {
- _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium, cachedir_with_hdlist($urpm, $medium))
+ _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium)
and return 'unmodified';
}
} else {
@@ -1437,7 +1437,7 @@ sub _update_medium__parse_if_unmodified__remote {
$options->{callback} and $options->{callback}('done', $medium->{name});
unless ($options->{force}) {
- _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium, cachedir_with_hdlist($urpm, $medium))
+ _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium)
and return 'unmodified';
}
} else {