diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | urpm/args.pm | 8 | ||||
| -rwxr-xr-x | urpmi | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -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}; } @@ -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) { |