-support rpm (jbj rpm 4.4.7+) hrmib exports for rpm -qa filter (via %_hrmib_path /var/cache/hrmib)
-add version+release+arch to installed packages filter
+Support rpm (jbj rpm 4.4.7+) hrmib exports for rpm -qa filter (via %_hrmib_path /var/cache/hrmib)
--
Signed-off-by: Elan Ruusamäe <glen@delfi.ee>
---- bash-completion/contrib/rpm~ 2009-07-21 06:28:45.000000000 +0300
-+++ bash-completion/contrib/rpm 2009-07-21 06:37:08.381279143 +0300
-@@ -6,17 +6,31 @@
- #
+--- bash-completion-1.2/contrib/rpm~ 2010-06-13 13:21:19.000000000 +0300
++++ bash-completion-1.2/contrib/rpm 2010-08-09 21:52:51.377872623 +0300
+@@ -5,6 +5,12 @@
+
_rpm_installed_packages()
{
-- local ver nodig="$1" nosig="$2"
-+ local nodig="$1" nosig="$2"
-+
-+ # if rpm (4.4.7+) is configured to export it's rpmdb to /var/cache/hrmib (%_hrmib_path)
-+ if [ -d /var/cache/hrmib -a -r /var/cache/hrmib ]; then
-+ COMPREPLY=( $( LC_ALL=C command ls -1 /var/cache/hrmib | sed -ne '/^'$cur'/p') )
-+ return
-+ fi
++ # if rpm (4.4.7+) is configured to export it's rpmdb to /var/cache/hrmib (%_hrmib_path)
++ if [ -d /var/cache/hrmib -a -r /var/cache/hrmib ]; then
++ COMPREPLY=( $( LC_ALL=C command ls -1 /var/cache/hrmib | sed -ne '/^'$cur'/p') )
++ return
++ fi
+
-+ # refresh cache if writable. FHS location
-+ if [ -w /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages ]; then
-+ # we grab the output to local variable to prevent possible race
-+ _rpm_nodigsig
-+ local tmp=$(rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n')
-+ echo "$tmp" > /var/cache/rpmpkgs.txt
-+ fi
-
- if [ -r /var/log/rpmpkgs -a \
- /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
- # using RHL 7.2 or later - this is quicker than querying the DB
- COMPREPLY=( $( sed -ne \
-- 's|^\('$cur'[^[:space:]]*\)-[^[:space:]-]\+-[^[:space:]-]\+\.rpm$|\1|p' \
-+ 's|^\('$cur'.*\)\.rpm$|\1|p' \
- /var/log/rpmpkgs ) )
- else
- _rpm_nodigsig
-- COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
-+ COMPREPLY=( $( rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
- fi
- }
+ local nodig="$1" nosig="$2"
+ if [[ -r /var/log/rpmpkgs && \