summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-16 09:39:54 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-16 09:39:54 +0000
commit61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4 (patch)
tree90ece6b6206ee3366829f9111251cff0cb1c1d72
parentd3fce3be5a425fc335e0bc8844c0ac120afe87a4 (diff)
downloadurpmi-61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4.tar
urpmi-61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4.tar.gz
urpmi-61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4.tar.bz2
urpmi-61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4.tar.xz
urpmi-61e13dc961a0e2ec59f2d5f3723a4a65fbbd3cb4.zip
Remove documentation for options that don't exist, and improve documentation of
--distrib.
-rw-r--r--pod/urpmi.addmedia.8.pod9
-rw-r--r--urpm/args.pm2
-rwxr-xr-xurpmi.addmedia7
3 files changed, 3 insertions, 15 deletions
diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index 45fc3d3d..cfd94857 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -138,8 +138,8 @@ to C<urpmi.addmedia> will represent the parent directory of a directory
B<media>, which in turn will contain various subdirectories for each
medium of the distribution. <I<name>> is combined with medium names found
to create newer medium names in the urpmi database. The B<with ...>
-option, if provided, is ignored, as hdlists found on the installation
-medium are used instead automatically.
+option, is not necessary, as hdlists found on the installation medium are
+used instead automatically.
=item B<--from> I<url>
@@ -148,11 +148,6 @@ F</etc/urpmi/mirror.config>, or
F<http://www.mandrivalinux.com/mirrorsfull.list> if this file doesn't
exist.
-=item B<--version> I<version>
-
-Use specified distribution version. The default is taken from the version
-of the distribution told by the installed mandriva-release package.
-
=item B<--virtual>
Creates a virtual medium. This only works for C<file://> and
diff --git a/urpm/args.pm b/urpm/args.pm
index a67427e7..0f648e12 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -296,8 +296,6 @@ my %options_spec = (
'no-probe' => sub { $options{probe_with} = undef },
distrib => sub { $options{distrib} = 1 },
'from=s' => \$options{mirrors_url},
- 'version=s' => \$options{version},
- 'arch=s' => \$options{arch},
virtual => \$options{virtual},
nopubkey => \$options{nopubkey},
'q|quiet' => sub { --$options{verbose} },
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 216afc12..09c36b0e 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -58,12 +58,7 @@ and [options] are from
medium.
") . N(" --from - use specified url for list of mirrors, the default is
%s
-", $urpm::cfg::mirrors) . N(" --version - use specified distribution version, the default is taken
- from the version of the distribution told by the
- installed mandriva-release package.
-") . N(" --arch - use specified architecture, the default is arch of
- mandriva-release package installed.
-") . N(" --virtual - create virtual media wich are always up-to-date,
+", $urpm::cfg::mirrors) . N(" --virtual - create virtual media wich are always up-to-date,
only file:// protocol is allowed.
") . N(" --no-md5sum - disable MD5SUM file checking.
") . N(" --norebuild - don't try to rebuild hdlist if not readable.