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

[Ville Skyttä]

 etc/yum.bash |   28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

New commits:
commit a8a5f81a1fe028628736f6e0b1bfeee3cae9a2bc
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Oct 4 19:42:56 2010 +0300

    Include local source package files in deplist file completions.

diff --git a/etc/yum.bash b/etc/yum.bash
index b7b420e..e1648dc 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -115,7 +115,7 @@ _yum()
             ;;
 
         deplist)
-            _yum_binrpmfiles "$cur"
+            COMPREPLY=( $( compgen -f -o plusdirs -X '!*.[rs]pm' -- "$cur" ) )
             [[ "$cur" == */* ]] || _yum_list all "$cur"
             return 0
             ;;
commit 3ff6f4178e3986d5fc1796933cd17972de6f0957
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Oct 4 19:35:50 2010 +0300

    Do not require "/" for local package completions.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=618154#c10

diff --git a/etc/yum.bash b/etc/yum.bash
index 8ca00fd..b7b420e 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -115,20 +115,14 @@ _yum()
             ;;
 
         deplist)
-            if [[ "$cur" == */* ]] ; then
-                _yum_binrpmfiles "$cur"
-            else
-                _yum_list all "$cur"
-            fi
+            _yum_binrpmfiles "$cur"
+            [[ "$cur" == */* ]] || _yum_list all "$cur"
             return 0
             ;;
 
         downgrade|reinstall)
-            if [[ "$cur" == */* ]] ; then
-                _yum_binrpmfiles "$cur"
-            else
-                _yum_list installed "$cur"
-            fi
+            _yum_binrpmfiles "$cur"
+            [[ "$cur" == */* ]] || _yum_list installed "$cur"
             return 0
             ;;
 
@@ -177,11 +171,8 @@ _yum()
             ;;
 
         install)
-            if [[ "$cur" == */* ]] ; then
-                _yum_binrpmfiles "$cur"
-            else
-                _yum_list available "$cur"
-            fi
+            _yum_binrpmfiles "$cur"
+            [[ "$cur" == */* ]] || _yum_list available "$cur"
             return 0
             ;;
 
@@ -213,11 +204,8 @@ _yum()
             ;;
 
         update|upgrade)
-            if [[ "$cur" == */* ]] ; then
-                _yum_binrpmfiles "$cur"
-            else
-                _yum_list updates "$cur"
-            fi
+            _yum_binrpmfiles "$cur"
+            [[ "$cur" == */* ]] || _yum_list updates "$cur"
             return 0
             ;;
         version)