[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-11-g344076f

Ville Skyttä ville.skytta at iki.fi
Thu Feb 10 21:55:27 UTC 2011


The following commit has been merged in the master branch:
commit dcb90a38ab1307ed7bc94c41a3ad4cf6a87efaa8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Feb 10 23:25:51 2011 +0200

    Make rpm --queryformat use more consistent.

diff --git a/completions/rpm b/completions/rpm
index 5838365..903a299 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -18,15 +18,16 @@ _rpm_installed_packages()
         COMPREPLY=( $( compgen -W '$( rpmqpack )' -- "$cur" ) )
     else
         _rpm_nodigsig
-        COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
+        COMPREPLY=( $( rpm -qa $nodig $nosig --queryformat='%{NAME} ' \
+            "$cur*" ) )
     fi
 }
 
 _rpm_groups()
 {
     local IFS=$'\n'
-    COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig --queryformat \
-        '%{group}\n' )" -- "$cur" ) )
+    COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
+        --queryformat='%{GROUP}\n' )" -- "$cur" ) )
 }
 
 _rpm_nodigsig()
@@ -119,7 +120,7 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n'
                 COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                    --queryformat='%{providename}\n' )" -- "$cur" ) )
+                    --queryformat='%{PROVIDENAME}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;
@@ -130,7 +131,7 @@ _rpm()
                 # complete on capabilities
                 local IFS=$'\n'
                 COMPREPLY=( $( compgen -W "$( rpm -qa $nodig $nosig \
-                        --queryformat='%{requirename}\n' )" -- "$cur" ) )
+                        --queryformat='%{REQUIRENAME}\n' )" -- "$cur" ) )
             fi
             return 0
             ;;

-- 
bash-completion



More information about the Bash-completion-commits mailing list