summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-19 12:32:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-19 12:32:02 +0000
commit7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a (patch)
tree6ecd78858c4a7b66f6204c8d71e57dc5b4b22606
parent3880463a92142896704deca4d341af93be762b84 (diff)
downloadurpmi-7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a.tar
urpmi-7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a.tar.gz
urpmi-7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a.tar.bz2
urpmi-7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a.tar.xz
urpmi-7a718bd220b3c2d62d0bd2e3b6e7f4f990b2ee8a.zip
since we check md5sum, don't also check size & mtime
-rw-r--r--urpm/media.pm16
1 files changed, 2 insertions, 14 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 73d769c8..1248ca9c 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -890,17 +890,6 @@ sub generate_medium_names {
}
-sub _read_existing_synthesis_if_same_time_and_msize {
- my ($urpm, $medium) = @_;
-
- same_size_and_mtime(cachedir_with_synthesis($urpm, $medium),
- statedir_synthesis($urpm, $medium)) or return;
-
- _read_existing_synthesis($urpm, $medium);
-
- 1;
-}
-
sub _read_existing_synthesis_if_same_md5sum {
my ($urpm, $medium, $retrieved_md5sum) = @_;
@@ -1165,9 +1154,8 @@ this could happen if you mounted manually the directory when creating the medium
$medium->{md5sum} = $retrieved_md5sum if $retrieved_md5sum;
- #- check if the files are equal... and no force copy...
if (!$options->{force}) {
- _read_existing_synthesis_if_same_time_and_msize($urpm, $medium)
+ _read_existing_synthesis($urpm, $medium)
and return 'unmodified';
}
1;
@@ -1262,7 +1250,7 @@ sub _update_medium__parse_if_unmodified__remote {
$medium->{md5sum} = $retrieved_md5sum if $retrieved_md5sum;
if (!$options->{force}) {
- _read_existing_synthesis_if_same_time_and_msize($urpm, $medium)
+ _read_existing_synthesis($urpm, $medium)
and return 'unmodified';
}
} else {