From 357cd102c55c8787a07465abb7c7a86ac8effe2c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 7 Oct 2011 17:48:49 +0000
Subject: fix broken 'urpmi --no-md5sum' (pok, mga#62557)

---
 NEWS         | 1 +
 urpm/args.pm | 8 ++++++--
 urpmi        | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index f65b10da..2eded443 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 - add infrastructure for rpmdrake (#920)
 - add infrastructure so that GUIes can offer not to ask anymore about missing
   or bad packages
+- fix broken 'urpmi --no-md5sum' (pok, mga#62557)
 - use rsync to download from rsync-mirrors (Alexander Barakin, mga#2518)
 
 Version 6.40 - 07 May 2010
diff --git a/urpm/args.pm b/urpm/args.pm
index 8e544659..12d4fee3 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -186,7 +186,6 @@ my %options_spec = (
 	'expect-install!' => \$::urpm::main_loop::expect_install,
 	'nolock' => \$options{nolock},
 	restricted => \$::restricted,
-	'no-md5sum' => \$::nomd5sum,
 	'force-key' => \$::forcekey,
 	a => \$::all,
 	p => sub { $::use_provides = 1 },
@@ -450,11 +449,16 @@ foreach my $k ("wget", "curl", "prozilla", "aria2", 'downloader=s', "proxy=s", "
     $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
 }
 
-foreach my $k ("f", "z", "no-md5sum", "update", "norebuild!", "probe-rpms", '<>')
+foreach my $k ("f", "z", "update", "norebuild!", "probe-rpms", '<>')
 {
     $options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};
 }
 
+foreach my $k ("no-md5sum")
+{
+    $options_spec{'urpmi'}{$k} = $options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};
+}
+
 foreach my $k ("a", '<>') {
     $options_spec{'urpmi.removemedia'}{$k} = $options_spec{'urpmi.update'}{$k};
 }
diff --git a/urpmi b/urpmi
index 96a3f109..2e998506 100755
--- a/urpmi
+++ b/urpmi
@@ -50,7 +50,6 @@ our $all = 0;
 our $use_provides = 1;
 our $logfile = '';
 our $restricted = 0;
-our $nomd5sum = 0;
 our $forcekey = 0;
 our $force_dudf = 0;
 
@@ -376,6 +375,7 @@ urpm::media::configure($urpm,
     usedistrib => $options{usedistrib},
     probe_with => $options{probe_with},
     download_callback => \&urpm::download::sync_logger,
+    nomd5sum => $options{nomd5sum},
 );
 
 if ($bug) {
-- 
cgit v1.2.1