Add --no-md5sum and --force-key options to urpmi

3 files changed, 24 insertions, 1 deletions

diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index 93041b52..8154f9cd 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -5,6 +5,7 @@ urpmi - rpm downloader, installer and dependency solver
 =head1 SYNOPSIS
 
     urpmi [options] [package_names | rpm_files...]
+    urpmi [options] --auto-select
 
 =head1 DESCRIPTION
 
@@ -106,6 +107,14 @@ Like B<--auto-select>, but also updates all relevant media before
 selection of upgradeable packages is made. This avoids a previous call to
 C<urpmi.update>.
 
+=item B<--no-md5sum>
+
+Disable MD5SUM file checking when updating media.
+
+=item B<--force-key>
+
+Force update of GPG key when updating media.
+
 =item B<--no-install>
 
 Only download packages, don't install them. After operation, you'll find
@@ -180,6 +189,11 @@ With this option, urpmi will ask the user on error whether it should
 proceed to a forced installation. By default, urpmi exits immediately in
 this case.
 
+=item B<--allow-medium-change>
+
+When used when B<--auto>, do not suppress all questions, but still ask the
+user for medium changes (e.g. insertion of CD-ROMs).
+
 =item B<--parallel> I<alias>
 
 Activate distributed execution of urpmi to other machines (it is mandatory
@@ -187,7 +201,8 @@ that urpmi is installed, but it is not necessary to have media defined on
 any machines). I<alias> defines which extension module is to be used by
 urpmi (currently, C<urpmi-parallel-ka-run> or C<urpmi-parallel-ssh> are
 available) and which machines should be updated. This alias is defined in
-the file F</etc/urpmi/parallel.cfg> as described below.
+the file F</etc/urpmi/parallel.cfg> as described in the L<urpmi.files>
+manpage.
 
 =item B<--root> I<directory>
 
diff --git a/urpm/args.pm b/urpm/args.pm
index a4ae78da..4c24a803 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -147,6 +147,8 @@ my %options_spec = (
 	'expect-install!' => \$::expect_install,
 	'nolock' => \$::nolock,
 	restricted => \$::restricted,
+	'no-md5sum' => \$::nomd5sum,
+	'force-key' => \$::forcekey,
 	a => \$::all,
 	q => sub { --$::verbose; $::rpm_opt = '' },
 	v => sub { ++$::verbose; $::rpm_opt = 'vh' },
diff --git a/urpmi b/urpmi
index c0361437..5aba76fb 100755
--- a/urpmi
+++ b/urpmi
@@ -60,6 +60,8 @@ our $usedistrib = 0;
 our $logfile = '';
 our $restricted = 0;
 our $nolock = 0;
+our $nomd5sum = 0;
+our $forcekey = 0;
 
 my @files;
 my @src_files;
@@ -133,6 +135,8 @@ usage:
 ") . N("  --ignoresize   - don't verify disk space before installation.
 ") . N("  --ignorearch   - allow to install rpms for unmatched architectures.
 ") . N("  --noscripts    - do not execute package scriptlet(s)
+") . N("  --no-md5sum    - disable MD5SUM file checking.
+") . N("  --force-key    - force update of gpg key.
 ") . N("  --repackage    - Re-package the files before erasing
 ") . N("  --skip         - packages which installation should be skipped
 ") . N("  --more-choices - when several packages are found, propose more choices
@@ -366,6 +370,8 @@ if ($auto_update && !$bug && !$env) {
 	noclean => $noclean,
 	norebuild => $urpm->{options}{norebuild},
 	quiet => $verbose < 0,
+	nomd5sum => $nomd5sum,
+	forcekey => $forcekey,
     );
     foreach (@{$urpm->{media} || []}) {
 	$_->{tempignore} and delete $_->{ignore};