[yum-commits] Branch 'yum-3_2_X' - cli.py docs/yum.8 etc/yum.bash

[Ville Skyttä]

 cli.py       |   25 ++++++++++++++-----------
 docs/yum.8   |   12 ++++++------
 etc/yum.bash |   17 +++++++++--------
 3 files changed, 29 insertions(+), 25 deletions(-)

New commits:
commit 3e8e0b1f844b8ff15c330c2e77901cf1af9ca08a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 16 22:39:14 2009 +0200

    Add long variants for all command line options.

diff --git a/cli.py b/cli.py
index 89e4fe8..16194e8 100644
--- a/cli.py
+++ b/cli.py
@@ -1303,27 +1303,30 @@ class YumOptionParser(OptionParser):
 
         group.add_option("-t", "--tolerant", action="store_true",
                 help=_("be tolerant of errors"))
-        group.add_option("-C", dest="cacheonly", action="store_true",
+        group.add_option("-C", "--cacheonly", dest="cacheonly",
+                action="store_true",
                 help=_("run entirely from system cache, don't update cache"))
-        group.add_option("-c", dest="conffile", default='/etc/yum/yum.conf',
-                help=_("config file location"), metavar=' [config file]')
-        group.add_option("-R", dest="sleeptime", type='int', default=None,
-                help=_("maximum command wait time"), metavar=' [minutes]')
-        group.add_option("-d", dest="debuglevel", default=None,
+        group.add_option("-c", "--config", dest="conffile",
+                default='/etc/yum/yum.conf',
+                help=_("config file location"), metavar='[config file]')
+        group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
+                default=None,
+                help=_("maximum command wait time"), metavar='[minutes]')
+        group.add_option("-d", "--debuglevel", dest="debuglevel", default=None,
                 help=_("debugging output level"), type='int',
-                metavar=' [debug level]')
+                metavar='[debug level]')
         group.add_option("--showduplicates", dest="showdupesfromrepos",
                         action="store_true",
                 help=_("show duplicates, in repos, in list/search commands"))
-        group.add_option("-e", dest="errorlevel", default=None,
+        group.add_option("-e", "--errorlevel", dest="errorlevel", default=None,
                 help=_("error output level"), type='int',
-                metavar=' [error level]')
+                metavar='[error level]')
         group.add_option("-q", "--quiet", dest="quiet", action="store_true",
                         help=_("quiet operation"))
         group.add_option("-v", "--verbose", dest="verbose", action="store_true",
                         help=_("verbose operation"))
-        group.add_option("-y", dest="assumeyes", action="store_true",
-                help=_("answer yes for all questions"))
+        group.add_option("-y", "--assumeyes", dest="assumeyes",
+                action="store_true", help=_("answer yes for all questions"))
         group.add_option("--version", action="store_true", 
                 help=_("show Yum version and exit"))
         group.add_option("--installroot", help=_("set install root"), 
diff --git a/docs/yum.8 b/docs/yum.8
index 899cb99..7ac9772 100644
--- a/docs/yum.8
+++ b/docs/yum.8
@@ -261,12 +261,12 @@ to set\&.
 .PP 
 .IP "\fB\-h, \-\-help\fP"
 Help; display a help message and then quit\&.
-.IP "\fB\-y\fP"
+.IP "\fB\-y, \-\-assumeyes\fP"
 Assume yes; assume that the answer to any question which would be asked 
 is yes\&.
 .br
 Configuration Option: \fBassumeyes\fP
-.IP "\fB\-c [config file]\fP" 
+.IP "\fB\-c, \-\-config=[config file]\fP" 
 Specifies the config file location - can take HTTP and FTP URLs and local file
 paths\&.
 .br
@@ -276,17 +276,17 @@ Run without output.  Note that you likely also want to use \-y\&.
 .IP "\fB\-v, \-\-verbose\fP" 
 Run with a lot of debugging output\&.
 .br
-.IP "\fB\-d [number]\fP" 
+.IP "\fB\-d, \-\-debuglevel=[number]\fP" 
 Sets the debugging level to [number] \- turns up or down the amount of things that are printed\&. Practical range: 0 - 10
 .br
 Configuration Option: \fBdebuglevel\fP
-.IP "\fB\-e [number]\fP" 
+.IP "\fB\-e, \-\-errorlevel=[number]\fP" 
 Sets the error level to [number] Practical range 0 \- 10. 0 means print only critical errors about which you must be told. 1 means print all errors, even ones that are not overly important. 1+ means print more errors (if any) \-e 0 is good for cron jobs.
 .br
 Configuration Option: \fBerrorlevel\fP
-.IP "\fB\-R [time in minutes]\fP" 
+.IP "\fB\-R, \-\-randomwait=[time in minutes]\fP" 
 Sets the maximum amount of time yum will wait before performing a command \- it randomizes over the time.
-.IP "\fB\-C\fP" 
+.IP "\fB\-C, \-\-cacheonly\fP" 
 Tells yum to run entirely from system cache - does not download or
 update any headers unless it has to to perform the requested action.
 .IP "\fB\-\-version\fP" 
diff --git a/etc/yum.bash b/etc/yum.bash
index ed83e76..c642d82 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -215,12 +215,12 @@ _yum()
 
     case $prev in
 
-        -d|-e)
+        -d|--debuglevel|-e|--errorlevel)
             COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9 10' -- "$cur" ) )
             return 0
             ;;
 
-        -c)
+        -c|--config)
             COMPREPLY=( $( compgen -f -o plusdirs -X "!*.conf" -- "$cur" ) )
             return 0
             ;;
@@ -261,18 +261,19 @@ _yum()
             return 0
             ;;
 
-        -R|-x|--exclude|-h|--help|--version|--releasever)
+        -R|--randomwait|-x|--exclude|-h|--help|--version|--releasever)
             return 0
             ;;
     esac
 
     $split && return 0
 
-    COMPREPLY=( $( compgen -W '--help --tolerant -C -c -R -d
-        --showduplicates -e --quiet --verbose -y --version --installroot
-        --enablerepo --disablerepo --exclude --disableexcludes --obsoletes
-        --noplugins --nogpgcheck --disableplugin --enableplugin
-        --skip-broken --color --releasever ${cmds[@]}' -- "$cur" ) )
+    COMPREPLY=( $( compgen -W '--help --tolerant --cacheonly --config
+        --randomwait --debuglevel --showduplicates --errorlevel --quiet
+        --verbose --assumeyes --version --installroot --enablerepo
+        --disablerepo --exclude --disableexcludes --obsoletes --noplugins
+        --nogpgcheck --disableplugin --enableplugin --skip-broken --color
+        --releasever ${cmds[@]}' -- "$cur" ) )
 } &&
 complete -F _yum -o filenames yum yummain.py