From f4e3ed0e00207712c8c7d8af31212f5cb56d1bc1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 5 Jun 2008 07:26:49 +0000 Subject: - urpmi.addmedia, urpmi.update: o fix --no-md5sum (regression introduced in 5.20) (#41237) --- NEWS | 3 +++ urpm/media.pm | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 8ac7c756..495fc0ba 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +- urpmi.addmedia, urpmi.update: + o fix --no-md5sum (regression introduced in 5.20) (#41237) + Version 5.20 - 2 June 2008, by Pascal "Pixel" Rigaux - urpmi: diff --git a/urpm/media.pm b/urpm/media.pm index 12d7f0cc..b2c12378 100644 --- a/urpm/media.pm +++ b/urpm/media.pm @@ -1337,7 +1337,7 @@ sub _update_medium__parse_if_unmodified__local { } my $ok = get_synthesis__local($urpm, $medium, $options->{callback}); - $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force}; + $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force} && !$options->{nomd5sum}; if ($ok) { 1; @@ -1452,7 +1452,7 @@ sub _update_medium__parse_if_unmodified__remote { $ok = get_synthesis__remote($urpm, $medium, $options->{callback}, $options->{quiet}); } - $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force}; + $ok &&= check_synthesis_md5sum($urpm, $medium) if !$options->{force} && !$options->{nomd5sum}; $options->{callback} and $options->{callback}('done', $medium->{name}); -- cgit v1.2.1