[yum-commits] 3 commits - yum-utils.bash

[Ville Skyttä]

 yum-utils.bash |   62 ++++++++++++++++++++++++++++++++++-----------------------
 1 file changed, 38 insertions(+), 24 deletions(-)

New commits:
commit 082ddcddd8214d8e8522b95ba43a8e07fd74225f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Dec 20 22:30:08 2010 +0200

    Simplify various completions by just invoking yum's functions ignoring stderr.

diff --git a/yum-utils.bash b/yum-utils.bash
index f3ea774..9733175 100644
--- a/yum-utils.bash
+++ b/yum-utils.bash
@@ -80,7 +80,7 @@ _yu_repo_graph()
             return 0
             ;;
         --repoid)
-            type _yum_repolist &>/dev/null && _yum_repolist all "$2"
+            _yum_repolist all "$2" 2>/dev/null
             return 0
             ;;
         -c)
@@ -114,8 +114,7 @@ _yu_repo_rss()
 
     COMPREPLY=( $( compgen -W '--help -f -l -t -d -r --tempcache -g -a -c' \
         -- "$2" ) )
-    [[ "$2" == -* ]] && return 0
-    type _yum_repolist &>/dev/null && _yum_repolist all "$2"
+    [[ "$2" == -* ]] || _yum_repolist all "$2" 2>/dev/null || return 0
 } &&
 complete -F _yu_repo_rss -o filenames repo-rss repo-rss.py
 
@@ -133,15 +132,15 @@ _yu_repoclosure()
             return 0
             ;;
         -l|--lookaside|-r|--repoid)
-            type _yum_repolist &>/dev/null && _yum_repolist all "$2"
+            _yum_repolist all "$2" 2>/dev/null
             return 0
             ;;
         -p|--pkg)
-            type _yum_list &>/dev/null && _yum_list all "$2"
+            _yum_list all "$2" 2>/dev/null
             return 0
             ;;
         -g|--group)
-            type _yum_grouplist &>/dev/null && _yum_grouplist "" "$2"
+            _yum_grouplist "" "$2" 2>/dev/null
             return 0
             ;;
     esac
@@ -170,15 +169,15 @@ _yu_repoquery()
             ;;
         -l|--list|-i|--info|-R|--requires)
             if $groupmode ; then
-                type _yum_grouplist &>/dev/null && _yum_grouplist "" "$2"
+                _yum_grouplist "" "$2" 2>/dev/null
             else
-                type _yum_list &>/dev/null && _yum_list all "$2"
+                _yum_list all "$2" 2>/dev/null
             fi
             return 0
             ;;
         --provides|--obsoletes|--conflicts|--groupmember|--changelog|\
         --location|--nevra|--envra|--nvr|-s|--source)
-            type _yum_list &>/dev/null && _yum_list all "$2"
+            _yum_list all "$2" 2>/dev/null
             return 0
             ;;
         --grouppkgs)
@@ -192,15 +191,15 @@ _yu_repoquery()
             return 0
             ;;
         --repoid)
-            type _yum_repolist &>/dev/null && _yum_repolist all "$2"
+            _yum_repolist all "$2" 2>/dev/null
             return 0
             ;;
         --enablerepo)
-            type _yum_repolist &>/dev/null && _yum_repolist disabled "$2"
+            _yum_repolist disabled "$2" 2>/dev/null
             return 0
             ;;
         --disablerepo)
-            type _yum_repolist &>/dev/null && _yum_repolist enabled "$2"
+            _yum_repolist enabled "$2" 2>/dev/null
             return 0
             ;;
         -c)
@@ -277,8 +276,7 @@ _yu_builddep()
     fi
 
     COMPREPLY=( $( compgen -f -o plusdirs -X "!*.spec" -- "$2" ) )
-    [[ $2 != */* && $2 != ~* ]] && type _yum_list &>/dev/null && \
-        _yum_list all "$2"
+    [[ $2 != */* && $2 != ~* ]] && _yum_list all "$2" 2>/dev/null
 } &&
 complete -F _yu_builddep -o filenames yum-builddep yum-builddep.py
 
commit 80776adc6f3699ce62c58133e02e4b111e599253
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Dec 20 22:19:59 2010 +0200

    Add debuginfo-install completion.

diff --git a/yum-utils.bash b/yum-utils.bash
index c573664..f3ea774 100644
--- a/yum-utils.bash
+++ b/yum-utils.bash
@@ -282,6 +282,23 @@ _yu_builddep()
 } &&
 complete -F _yu_builddep -o filenames yum-builddep yum-builddep.py
 
+# debuginfo-install
+_yu_debuginfo_install()
+{
+    COMPREPLY=()
+
+    _yum_complete_baseopts "$2" "$3" && return 0
+
+    if [[ $2 == -* ]] ; then
+        COMPREPLY=( $( compgen -W '$( _yum_baseopts 2>/dev/null )
+            --no-debuginfo-plugin' -- "$2" ) )
+        return 0
+    fi
+
+    _yum_list all "$2"
+} &&
+complete -F _yu_debuginfo_install debuginfo-install debuginfo-install.py
+
 # Local variables:
 # mode: shell-script
 # sh-basic-offset: 4
commit 6e1a2c556aa8e259cbadc0b9097614fef51d1608
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Dec 20 22:17:59 2010 +0200

    Use yum's base option completion in package-cleanup and yum-builddep if available.

diff --git a/yum-utils.bash b/yum-utils.bash
index 2c5e527..c573664 100644
--- a/yum-utils.bash
+++ b/yum-utils.bash
@@ -30,24 +30,22 @@ _yu_package_cleanup()
 {
     COMPREPLY=()
 
+    _yum_complete_baseopts "$2" "$3" 2>/dev/null && return 0
+
     case "$3" in
-        -h|--help|--leaf-regex|--qf|--queryformat)
+        --leaf-regex|--qf|--queryformat)
             return 0
             ;;
         --count)
             COMPREPLY=( $( compgen -W '1 2 3 4 5 6 7 8 9' -- "$2" ) )
             return 0
             ;;
-        -c)
-            COMPREPLY=( $( compgen -f -o plusdirs -X "!*.conf" -- "$2" ) )
-            return 0
-            ;;
     esac
 
-    COMPREPLY=( $( compgen -W '--help --problems --leaves --all --leaf-regex
-        --exclude-devel --exclude-bin --orphans --noplugins --quiet -y --dupes
-        --cleandupes --oldkernels --count --keepdevel -c --queryformat' \
-            -- "$2" ) )
+    COMPREPLY=( $( compgen -W '$( _yum_baseopts 2>/dev/null ) --problems
+        --queryformat --orphans --dupes --cleandupes --noscripts --leaves --all
+        --leaf-regex --exclude-devel --exclude-bin --oldkernels --count
+        --keepdevel' -- "$2" ) )
 } &&
 complete -F _yu_package_cleanup -o filenames package-cleanup package-cleanup.py
 
@@ -271,9 +269,10 @@ _yu_builddep()
 {
     COMPREPLY=()
 
-    # TODO: options handling (should really come from yum completion)
+    _yum_complete_baseopts "$2" "$3" && return 0
 
     if [[ $2 == -* ]] ; then
+        COMPREPLY=( $( compgen -W '$( _yum_baseopts 2>/dev/null )' -- "$2" ) )
         return 0
     fi