- -mplayer.patch is useless there already is fl[iv]|FL[IV] (hanska)

[packages/bash-completion.git] / bash-completion-rpm-cache.patch

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

--
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 @@
 #
 _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
+
+	# 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
 }