[yum-commits] Branch 'yum-3_2_X' - etc/yum.bash

[Ville Skyttä]

 etc/yum.bash |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit e0b1c00e80d6f4822b74664a57caacef6b5fafde
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Dec 8 18:13:03 2010 +0200

    Don't offer --*ableplugin options if --noplugins is already given.

diff --git a/etc/yum.bash b/etc/yum.bash
index 303f190..8363672 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -300,12 +300,14 @@ _yum()
 
     $split && return 0
 
-    COMPREPLY=( $( compgen -W '--help --tolerant --cacheonly --config
-        --randomwait --debuglevel --showduplicates --errorlevel --rpmverbosity
-        --quiet --verbose --assumeyes --version --installroot --enablerepo
+    local opts='--help --tolerant --cacheonly --config --randomwait
+        --debuglevel --showduplicates --errorlevel --rpmverbosity --quiet
+        --verbose --assumeyes --version --installroot --enablerepo
         --disablerepo --exclude --disableexcludes --obsoletes --noplugins
-        --nogpgcheck --disableplugin --enableplugin --skip-broken --color
-        --releasever --setopt ${cmds[@]}' -- "$cur" ) )
+        --nogpgcheck --skip-broken --color --releasever --setopt'
+    [[ $COMP_LINE == *--noplugins* ]] || \
+        opts="$opts --disableplugin --enableplugin"
+    COMPREPLY=( $( compgen -W '$opts ${cmds[@]}' -- "$cur" ) )
 } &&
 complete -F _yum -o filenames yum yummain.py