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

[Ville Skyttä]

 etc/yum.bash |   37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 527ffba788eaa8fe9990b93660108fe3d464be7e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 29 22:59:29 2011 +0300

    Avoid some "yum list" invocations on strings starting with ~.

diff --git a/etc/yum.bash b/etc/yum.bash
index 184094e..cf43106 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -221,7 +221,7 @@ _yum()
 
         deplist)
             COMPREPLY=( $( compgen -f -o plusdirs -X '!*.[rs]pm' -- "$cur" ) )
-            [[ "$cur" == */* ]] || _yum_list all "$cur"
+            [[ "$cur" == */* || "$cur" == ~* ]] || _yum_list all "$cur"
             return 0
             ;;
 
@@ -234,7 +234,7 @@ _yum()
 
         downgrade|reinstall)
             _yum_binrpmfiles "$cur"
-            [[ "$cur" == */* ]] || _yum_list installed "$cur"
+            [[ "$cur" == */* || "$cur" == ~* ]] || _yum_list installed "$cur"
             return 0
             ;;
 
@@ -283,7 +283,7 @@ _yum()
 
         install)
             _yum_binrpmfiles "$cur"
-            [[ "$cur" == */* ]] || _yum_list available "$cur"
+            [[ "$cur" == */* || "$cur" == ~* ]] || _yum_list available "$cur"
             return 0
             ;;
 
@@ -313,7 +313,7 @@ _yum()
 
         update|upgrade)
             _yum_binrpmfiles "$cur"
-            [[ "$cur" == */* ]] || _yum_list updates "$cur"
+            [[ "$cur" == */* || "$cur" == ~* ]] || _yum_list updates "$cur"
             return 0
             ;;
         version)
commit 9ba877b33512aee534b4d6d1c6a1b00f27dc231a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 29 22:52:10 2011 +0300

    Trivial cleanups.

diff --git a/etc/yum.bash b/etc/yum.bash
index 20209f2..184094e 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -213,10 +213,9 @@ _yum()
             ;;
 
         clean)
-            if [ "$prev" = clean ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -W 'expire-cache packages headers
                     metadata cache dbcache all' -- "$cur" ) )
-            fi
             return 0
             ;;
 
@@ -250,15 +249,14 @@ _yum()
             ;;
 
         help)
-            if [ "$prev" = help ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -W '${cmds[@]}' -- "$cur" ) )
-            fi
             return 0
             ;;
 
         history)
             case $prev in
-                history)
+                $cmd)
                     COMPREPLY=( $( compgen -W 'info list summary undo redo
                         new addon-info package-list' -- "$cur" ) )
                     ;;
@@ -290,10 +288,9 @@ _yum()
             ;;
 
         list)
-            if [ "$prev" = list ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -W 'all available updates installed
                     extras obsoletes recent' -- "$cur" ) )
-            fi
             return 0
             ;;
 
@@ -303,16 +300,14 @@ _yum()
             ;;
 
         repolist)
-            if [ "$prev" = repolist ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -W 'all enabled disabled' -- "$cur" ) )
-            fi
             return 0
             ;;
 
         shell)
-            if [ "$prev" = shell ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -f -o plusdirs -- "$cur" ) )
-            fi
             return 0
             ;;
 
@@ -322,10 +317,9 @@ _yum()
             return 0
             ;;
         version)
-            if [ "$prev" = version ] ; then
+            [ "$prev" = "$cmd" ] && \
                 COMPREPLY=( $( compgen -W 'all installed available nogroups
                     grouplist groupinfo' -- "$cur" ) )
-            fi
             return 0
             ;;
     esac
commit dcaf56a0f53833c5c59a2c439b11e8561216111c
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Mar 29 22:41:20 2011 +0300

    Add distro-sync full|different completion.

diff --git a/etc/yum.bash b/etc/yum.bash
index 1ccb83d..20209f2 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -226,13 +226,20 @@ _yum()
             return 0
             ;;
 
+        distro-sync|distribution-synchronization)
+            [ "$prev" = "$cmd" ] && \
+                COMPREPLY=( $( compgen -W 'full different' -- "$cur" ) )
+            _yum_list installed "$cur"
+            return 0
+            ;;
+
         downgrade|reinstall)
             _yum_binrpmfiles "$cur"
             [[ "$cur" == */* ]] || _yum_list installed "$cur"
             return 0
             ;;
 
-        erase|remove|distro-sync|distribution-synchronization)
+        erase|remove)
             _yum_list installed "$cur"
             return 0
             ;;