summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-05-15 12:36:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-05-15 12:36:32 +0000
commit15cc4ae32901ff2d8adddbd58953b695cdee4d5c (patch)
tree03053effcb7fdbae3c0e6bf9407bdca0b363dc91
parentbc618b33990b5bef7da88b4b076e41f0dd2c32ba (diff)
downloadurpmi-15cc4ae32901ff2d8adddbd58953b695cdee4d5c.tar
urpmi-15cc4ae32901ff2d8adddbd58953b695cdee4d5c.tar.gz
urpmi-15cc4ae32901ff2d8adddbd58953b695cdee4d5c.tar.bz2
urpmi-15cc4ae32901ff2d8adddbd58953b695cdee4d5c.tar.xz
urpmi-15cc4ae32901ff2d8adddbd58953b695cdee4d5c.zip
- urpmi.addmedia, urpmi.update:
o fix checking synthesis MD5SUM ie fix typo
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 83c370e2..bb95dc69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
- urpmi.addmedia:
o add missing mark in "Do you want to add media '%s'?" message (from Nikos)
+- urpmi.addmedia, urpmi.update:
+ o fix checking synthesis MD5SUM
Version 5.19 - 3 April 2008, by Pascal "Pixel" Rigaux
diff --git a/urpm/media.pm b/urpm/media.pm
index 230946cd..82338da8 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1328,7 +1328,7 @@ sub _update_medium__parse_if_unmodified__local {
}
my $ok = get_synthesis__local($urpm, $medium, $options->{callback});
- $ok &&= !$options->{force} || check_synthesis_md5sum($urpm, $medium);
+ $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force};
if ($ok) {
1;
@@ -1424,7 +1424,7 @@ sub _update_medium__parse_if_unmodified__remote {
$ok = get_synthesis__remote($urpm, $medium, $options->{callback}, $options->{quiet});
}
- $ok &&= !$options->{force} || check_synthesis_md5sum($urpm, $medium);
+ $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force};
$options->{callback} and $options->{callback}('done', $medium->{name});