Attachment 5637 Details for Bug 10726 – 0003-Put-corresponding-long-and-short-options-in-same-lin.patch

[patch] 0003-Put-corresponding-long-and-short-options-in-same-lin.patch

0003-Put-corresponding-long-and-short-options-in-same-lin.patch (text/plain), 5.19 KB, created by Hartmut Goebel on 2014-11-25 01:09:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Hartmut Goebel

Created: 2014-11-25 01:09:21 CET

Size: 5.19 KB

patch

obsolete

>From 6957b58ec0063e41f22146a1c0a6a134d26ee7b7 Mon Sep 17 00:00:00 2001
>From: Hartmut Goebel <h.goebel@crazy-compilers.com>
>Date: Mon, 24 Nov 2014 23:28:26 +0100
>Subject: [PATCH 3/6] Put corresponding long and short options in same line.
>
>---
> pod/8/urpme.pod | 10 +++-------
> pod/8/urpmf.pod |  6 +-----
> pod/8/urpmi.pod | 18 +++---------------
> pod/8/urpmq.pod | 50 +++++++++++++-------------------------------------
> 4 files changed, 20 insertions(+), 64 deletions(-)
>
>diff --git a/pod/8/urpme.pod b/pod/8/urpme.pod
>index 158a695..8358a12 100644
>--- a/pod/8/urpme.pod
>+++ b/pod/8/urpme.pod
>@@ -18,22 +18,18 @@ want to specify packages more broadly, use the B<-a> option.
> 
> =over
> 
>-=item B<--help>
>+=item B<-h>, B<-?>, B<--help>
> 
>-Prints a help message and exit (this is the same as B<-h> or B<-?>).
>+Prints a help message and exit.
> 
> =item B<-a>
> 
> If multiple packages match the given substring, deinstall them all.
> 
>-=item B<--verbose>
>+=item B<-v>, B<--verbose>
> 
> Proposes a verbose mode with various messages.
> 
>-=item B<-v>
>-
>-This is the same as B<--verbose>.
>-
> =item B<--auto>
> 
> Removes packages non-interactively, without asking questions.
>diff --git a/pod/8/urpmf.pod b/pod/8/urpmf.pod
>index 54e6314..bff688d 100644
>--- a/pod/8/urpmf.pod
>+++ b/pod/8/urpmf.pod
>@@ -40,15 +40,11 @@ Use a different environment directly out of a bug report tarball.
> 
> Do not use the given media.
> 
>-=item B<--literal>
>+=item B<-l>, B<--literal>
> 
> Match literally instead of interpreting the argument as a regular
> expression.
> 
>-=item B<-l>
>-
>-Equivalent to B<--literal>.
>-
> =item B<--media> I<medium1,...,mediumN>
> 
> Select specific media to be used, instead of defaulting to all available
>diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod
>index ce90199..ef72840 100644
>--- a/pod/8/urpmi.pod
>+++ b/pod/8/urpmi.pod
>@@ -148,7 +148,7 @@ Split urpmi's operation in small transactions of at
> least I<count> packages. The default is 8 and setting this value to 0 just
> disables splitting in small transactions.
> 
>-=item B<--fuzzy>
>+=item B<-y>, B<--fuzzy>
> 
> Disable fast search on exact package name; that means that urpmi will
> propose all packages matching part of the name, even if one of them
>@@ -178,11 +178,11 @@ F</var/cache/urpmi/rpms>.
> 
> Assume yes on all questions.
> 
>-=item B<--quiet>
>+=item B<-q>, B<--quiet>
> 
> Quiet mode: when calling rpm no upgrade status is printed.
> 
>-=item B<--verbose>
>+=item B<-v>, B<--verbose>
> 
> Proposes a verbose mode with various messages.
> 
>@@ -411,18 +411,6 @@ Allow search in provides to find the package (this is the default).
> 
> Do not search in provides to find package (this is the opposite of B<-p>).
> 
>-=item B<-y>
>-
>-This is the same as B<--fuzzy>.
>-
>-=item B<-q>
>-
>-This is the same as B<--quiet>.
>-
>-=item B<-v>
>-
>-This is the same as B<--verbose>.
>-
> =back
> 
> =head1 EXAMPLES
>diff --git a/pod/8/urpmq.pod b/pod/8/urpmq.pod
>index 6778b73..577505a 100644
>--- a/pod/8/urpmq.pod
>+++ b/pod/8/urpmq.pod
>@@ -20,9 +20,9 @@ according to the command-line options that were used:
> 
> =over
> 
>-=item B<--help>
>+=item B<-h>, B<-?>, B<--help>
> 
>-Prints a help message and exit (this is the same as B<-h> or B<-?>).
>+Prints a help message and exit.
> 
> =item B<--list>
> 
>@@ -112,13 +112,17 @@ of removing them. This behaviour generally rejects the upgrade of packages
> given on command line (or when using B<--auto-select>) when a dependency error
> occurs.
> 
>-=item B<--fuzzy>
>+=item B<-y>, B<--fuzzy>
> 
> Disable fast search on exact package name; i.e. it will propose
> all packages matching the name partially, even if one of them matches exactly
>-the specified name (this is the same as B<-y>).
>+the specified name.
> 
>-=item B<--src> I<name>
>+=item B<-Y>
>+
>+Like B<-y>/B<--fuzzy>, but forces to match case-insensitively.
>+
>+=item B<-s>, B<--src> I<name>
> 
> Search a source package
> matching I<name> and it will select all dependencies by default.
>@@ -243,22 +247,14 @@ Prints the package suggests.
> 
> Prints the sourcerpm of the package
> 
>-=item B<--summary>
>+=item B<-S>, B<--summary>
> 
> Prints concise information about the package.
> 
>-=item B<--verbose>
>+=item B<-v>, B<--verbose>
> 
> Activate verbose mode.
> 
>-=item B<-v>
>-
>-This is the same as B<--verbose>.
>-
>-=item B<-d>
>-
>-This is the same as B<--requires-recursive>.
>-
> =item B<-u>
> 
> Deselect packages if a better version is already installed.
>@@ -278,11 +274,11 @@ If maximal closure is used, assume that a package listed may have wrong or
> not up-to-date dependencies. This causes more packages to be upgraded and
> may correct unresolved dependencies on the rpm database.
> 
>-=item B<--requires-recursive>
>+=item B<-d>, B<--requires-recursive>
> 
> Print dependencies (maximal closure).
> 
>-=item B<--whatprovides>
>+=item B<-p>, B<--whatprovides>
> 
> Search in provides to find package.
> 
>@@ -295,26 +291,6 @@ Reverse search to what requires the package given.
> Reverse search to what requires recursively the package given
> (looking through virtual packages).
> 
>-=item B<-S>
>-
>-Same as B<--summary>.
>-
>-=item B<-y>
>-
>-This is the same as B<--fuzzy>.
>-
>-=item B<-Y>
>-
>-Like B<-y>, but forces to match case-insensitively.
>-
>-=item B<-s>
>-
>-This is the same as B<--src>.
>-
>-=item B<-p>
>-
>-This is the same as B<--whatprovides>.
>-
> =item B<-i>
> 
> Prints useful information in human readable form, as for I<rpm -qi>.
>-- 
>1.8.4.5
>

From 6957b58ec0063e41f22146a1c0a6a134d26ee7b7 Mon Sep 17 00:00:00 2001
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
Date: Mon, 24 Nov 2014 23:28:26 +0100
Subject: [PATCH 3/6] Put corresponding long and short options in same line.

---
 pod/8/urpme.pod | 10 +++-------
 pod/8/urpmf.pod |  6 +-----
 pod/8/urpmi.pod | 18 +++---------------
 pod/8/urpmq.pod | 50 +++++++++++++-------------------------------------
 4 files changed, 20 insertions(+), 64 deletions(-)

diff --git a/pod/8/urpme.pod b/pod/8/urpme.pod
index 158a695..8358a12 100644
--- a/pod/8/urpme.pod
+++ b/pod/8/urpme.pod
@@ -18,22 +18,18 @@ want to specify packages more broadly, use the B<-a> option.
 
 =over
 
-=item B<--help>
+=item B<-h>, B<-?>, B<--help>
 
-Prints a help message and exit (this is the same as B<-h> or B<-?>).
+Prints a help message and exit.
 
 =item B<-a>
 
 If multiple packages match the given substring, deinstall them all.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Proposes a verbose mode with various messages.
 
-=item B<-v>
-
-This is the same as B<--verbose>.
-
 =item B<--auto>
 
 Removes packages non-interactively, without asking questions.
diff --git a/pod/8/urpmf.pod b/pod/8/urpmf.pod
index 54e6314..bff688d 100644
--- a/pod/8/urpmf.pod
+++ b/pod/8/urpmf.pod
@@ -40,15 +40,11 @@ Use a different environment directly out of a bug report tarball.
 
 Do not use the given media.
 
-=item B<--literal>
+=item B<-l>, B<--literal>
 
 Match literally instead of interpreting the argument as a regular
 expression.
 
-=item B<-l>
-
-Equivalent to B<--literal>.
-
 =item B<--media> I<medium1,...,mediumN>
 
 Select specific media to be used, instead of defaulting to all available
diff --git a/pod/8/urpmi.pod b/pod/8/urpmi.pod
index ce90199..ef72840 100644
--- a/pod/8/urpmi.pod
+++ b/pod/8/urpmi.pod
@@ -148,7 +148,7 @@ Split urpmi's operation in small transactions of at
 least I<count> packages. The default is 8 and setting this value to 0 just
 disables splitting in small transactions.
 
-=item B<--fuzzy>
+=item B<-y>, B<--fuzzy>
 
 Disable fast search on exact package name; that means that urpmi will
 propose all packages matching part of the name, even if one of them
@@ -178,11 +178,11 @@ F</var/cache/urpmi/rpms>.
 
 Assume yes on all questions.
 
-=item B<--quiet>
+=item B<-q>, B<--quiet>
 
 Quiet mode: when calling rpm no upgrade status is printed.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Proposes a verbose mode with various messages.
 
@@ -411,18 +411,6 @@ Allow search in provides to find the package (this is the default).
 
 Do not search in provides to find package (this is the opposite of B<-p>).
 
-=item B<-y>
-
-This is the same as B<--fuzzy>.
-
-=item B<-q>
-
-This is the same as B<--quiet>.
-
-=item B<-v>
-
-This is the same as B<--verbose>.
-
 =back
 
 =head1 EXAMPLES
diff --git a/pod/8/urpmq.pod b/pod/8/urpmq.pod
index 6778b73..577505a 100644
--- a/pod/8/urpmq.pod
+++ b/pod/8/urpmq.pod
@@ -20,9 +20,9 @@ according to the command-line options that were used:
 
 =over
 
-=item B<--help>
+=item B<-h>, B<-?>, B<--help>
 
-Prints a help message and exit (this is the same as B<-h> or B<-?>).
+Prints a help message and exit.
 
 =item B<--list>
 
@@ -112,13 +112,17 @@ of removing them. This behaviour generally rejects the upgrade of packages
 given on command line (or when using B<--auto-select>) when a dependency error
 occurs.
 
-=item B<--fuzzy>
+=item B<-y>, B<--fuzzy>
 
 Disable fast search on exact package name; i.e. it will propose
 all packages matching the name partially, even if one of them matches exactly
-the specified name (this is the same as B<-y>).
+the specified name.
 
-=item B<--src> I<name>
+=item B<-Y>
+
+Like B<-y>/B<--fuzzy>, but forces to match case-insensitively.
+
+=item B<-s>, B<--src> I<name>
 
 Search a source package
 matching I<name> and it will select all dependencies by default.
@@ -243,22 +247,14 @@ Prints the package suggests.
 
 Prints the sourcerpm of the package
 
-=item B<--summary>
+=item B<-S>, B<--summary>
 
 Prints concise information about the package.
 
-=item B<--verbose>
+=item B<-v>, B<--verbose>
 
 Activate verbose mode.
 
-=item B<-v>
-
-This is the same as B<--verbose>.
-
-=item B<-d>
-
-This is the same as B<--requires-recursive>.
-
 =item B<-u>
 
 Deselect packages if a better version is already installed.
@@ -278,11 +274,11 @@ If maximal closure is used, assume that a package listed may have wrong or
 not up-to-date dependencies. This causes more packages to be upgraded and
 may correct unresolved dependencies on the rpm database.
 
-=item B<--requires-recursive>
+=item B<-d>, B<--requires-recursive>
 
 Print dependencies (maximal closure).
 
-=item B<--whatprovides>
+=item B<-p>, B<--whatprovides>
 
 Search in provides to find package.
 
@@ -295,26 +291,6 @@ Reverse search to what requires the package given.
 Reverse search to what requires recursively the package given
 (looking through virtual packages).
 
-=item B<-S>
-
-Same as B<--summary>.
-
-=item B<-y>
-
-This is the same as B<--fuzzy>.
-
-=item B<-Y>
-
-Like B<-y>, but forces to match case-insensitively.
-
-=item B<-s>
-
-This is the same as B<--src>.
-
-=item B<-p>
-
-This is the same as B<--whatprovides>.
-
 =item B<-i>
 
 Prints useful information in human readable form, as for I<rpm -qi>.
-- 
1.8.4.5

Actions: View | Diff

Attachments on bug 10726: 5635 | 5636 | 5637 | 5638 | 5639 | 5640 | 5641