From 2386d4d94e8987a2aed06e9a7ded50ca58d4a541 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Fri, 29 Apr 2005 14:35:46 +0000
Subject: add a --nopubkey option to urpmi.addmedia

---
 man/C/urpmi.addmedia.8 | 4 ++++
 urpm/args.pm           | 1 +
 urpmi.addmedia         | 1 +
 urpmi.bash-completion  | 4 ++--
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/man/C/urpmi.addmedia.8 b/man/C/urpmi.addmedia.8
index 29052bc7..f1144a57 100644
--- a/man/C/urpmi.addmedia.8
+++ b/man/C/urpmi.addmedia.8
@@ -108,6 +108,8 @@ taken from the file /etc/urpmi/mirror.config, or
 \fIhttp://www.mandrivalinux.com/mirrorsfull.list\fP if this file doesn't
 exist.
 .IP "\fB\--version\fP \fIversion\fP"
+Use specified distribution version. The default is taken from the version of
+the distribution told by the installed mandriva-release package.
 .IP "\fB\--virtual\fP"
 Create a virtual medium, this only works for file:// and removable:// protocol
 and no files will be created in /var/lib/urpmi. The medium is always up-to-date
@@ -119,6 +121,8 @@ readable or was corrupted.
 Add the new media in the urpmi configuration file, but don't update it nor
 proceed to any download. The media, to be usable, will need to be updated with
 \fBurpmi.update\fP.
+.IP "\fB\--nopubkey\fP"
+Don't import pubkey of added media
 .IP "\fB\-c\fP"
 Clean headers cache directory in /var/cache/urpmi/headers.
 .IP "\fB\-h\fP"
diff --git a/urpm/args.pm b/urpm/args.pm
index d5dac68c..44742a9b 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -270,6 +270,7 @@ my %options_spec = (
 	'version=s' => \$options{version},
 	'arch=s' => \$options{arch},
 	virtual => \$options{virtual},
+	nopubkey => \$options{nopubkey},
 	'q|quiet'   => sub { --$options{verbose} },
 	'v|verbose' => sub { ++$options{verbose} },
 	raw => \$options{raw},
diff --git a/urpmi.addmedia b/urpmi.addmedia
index d69e0f77..cfb3321b 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -66,6 +66,7 @@ and [options] are from
                    only file:// protocol is allowed.
 ") . N("  --no-md5sum    - disable MD5SUM file checking.
 ") . N("  --norebuild    - don't try to rebuild hdlist if not readable.
+") . N("  --nopubkey     - don't import pubkey of added media
 ") . N("  --raw          - add the media in config, but don't update it.
 ") . N("  -c             - clean headers cache directory.
 ") . N("  -f             - force generation of hdlist files.
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index d18cd124..2c48f487 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -234,9 +234,9 @@ _urpmi_addmedia()
 	if [[ "$cur" == -* ]]; then
 		# return list of available options
 		COMPREPLY=( $( compgen -W '-c -f -h -v -q --help --wget --curl \
-			--limit-rate --proxy --proxy-user --update \
+			--limit-rate --proxy --proxy-user --update --raw \
 			--probe-synthesis --probe-hdlist --no-probe --distrib \
-			--env --version --arch --virtual --norebuild' -- $cur ) )
+			--env --version --arch --virtual --norebuild --nopubkey' -- $cur ) )
 	else
 		# count number of mandatory args given sofar
 		args=$COMP_CWORD
-- 
cgit v1.2.1