summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-21 15:43:26 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-21 15:43:26 +0000
commit77c4139421e6850ab5554e972b809b3ba152dec4 (patch)
tree7c6c4346a15cd68436ebecc2ff8ead5f44676876
parent8ed156eb542192f7d2a1bec5bc25beb63e847efb (diff)
downloadurpmi-77c4139421e6850ab5554e972b809b3ba152dec4.tar
urpmi-77c4139421e6850ab5554e972b809b3ba152dec4.tar.gz
urpmi-77c4139421e6850ab5554e972b809b3ba152dec4.tar.bz2
urpmi-77c4139421e6850ab5554e972b809b3ba152dec4.tar.xz
urpmi-77c4139421e6850ab5554e972b809b3ba152dec4.zip
fix an optimisation i introduced which breaks generated /var/lib/urpmi/MD5SUM
-rw-r--r--urpm.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/urpm.pm b/urpm.pm
index 4fac9a17..b2900de8 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1469,8 +1469,10 @@ this could happen if you mounted manually the directory when creating the medium
my ($retrieved_md5sum);
if (!$options->{nomd5sum} && file_size(_hdlist_dir($medium) . '/MD5SUM') > 32) {
+ #- get md5sum even if there is no local md5sum to compare with,
+ #- since $retrieved_md5sum is needed to write into /var/lib/urpmi/MD5SUM
+ $retrieved_md5sum = parse_md5sum($urpm, _hdlist_dir($medium) . '/MD5SUM', basename($medium->{with_hdlist}));
if (local_md5sum($urpm, $medium, $options->{force})) {
- $retrieved_md5sum = parse_md5sum($urpm, _hdlist_dir($medium) . '/MD5SUM', basename($medium->{with_hdlist}));
_read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $retrieved_md5sum)
and return 'unmodified';
}