SOURCES: bash-completion-rpm-cache.patch - merged bash-completion-...

[glen]

Author: glen                         Date: Tue Jan  8 01:09:54 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged bash-completion-FHS.patch bash-completion-rpm-arch.patch
- always pass --nodigest --nosignature to rpm command

---- Files affected:
SOURCES:
   bash-completion-rpm-cache.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/bash-completion-rpm-cache.patch
diff -u SOURCES/bash-completion-rpm-cache.patch:1.1 SOURCES/bash-completion-rpm-cache.patch:1.2
--- SOURCES/bash-completion-rpm-cache.patch:1.1	Wed Mar  1 21:08:02 2006
+++ SOURCES/bash-completion-rpm-cache.patch	Tue Jan  8 02:09:49 2008
@@ -1,19 +1,42 @@
---- bash_completion/bash_completion	2005-01-04 08:37:42.000000000 +0200
-+++ bash_completion	2006-03-01 22:00:59.000000000 +0200
-@@ -1734,8 +1734,14 @@
+--- bash_completion/bash_completion~	2006-03-01 18:20:18.000000000 +0200
++++ bash_completion/bash_completion	2008-01-08 02:50:17.000000000 +0200
+@@ -1732,29 +1732,20 @@
+ #
+ _rpm_installed_packages()
  {
- 	local ver nodig nosig
- 
--	if [ -r /var/log/rpmpkgs -a \
--		/var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
+-	local ver nodig nosig
 +	# refresh cache if writable
-+	if [ /var/log/rpmpkgs -ot /var/lib/rpm/Packages -a -w /var/log/rpmpkgs ]; then
++	if [ /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages -a -w /var/cache/rpmpkgs.txt ]; then
 +		# we grab the output to local variable to prevent possible race
-+		local tmp=$(rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' | LC_ALL=C sort)
-+		echo "$tmp" > /var/log/rpmpkgs
++		local tmp=$(rpm -qa --nodigest --nosignature --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' | LC_ALL=C sort)
++		echo "$tmp" > /var/cache/rpmpkgs.txt
 +	fi
-+
-+	if [ -r /var/log/rpmpkgs -a /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
+ 
+-	if [ -r /var/log/rpmpkgs -a \
+-		/var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
++	if [ -r /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -nt /var/lib/rpm/Packages ]; then
  		# using RHL 7.2 or later - this is quicker than querying the DB
  		COMPREPLY=( $( sed -ne \
- 		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
+-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
+-				/var/log/rpmpkgs ) )
++ 		's|^\('$cur'.*\)\.rpm$|\1|p' \
++				/var/cache/rpmpkgs.txt ) )
+ 	else
+-		nodig=""
+-		nosig=""
+-		ver=$(rpm --version)
+-		ver=${ver##* }
+-	  
+-		if [[ "$ver" > "4.0.4" ]]; then
+-			nodig="--nodigest"
+-		fi
+-		if [[ "$ver" > "4.0.99" ]]; then
+-			nosig="--nosignature"
+-		fi
+-
+-		COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
+-		's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
++ 		COMPREPLY=( $( rpm -qa --nodigest --nosignature --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
+ 	fi
+ }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bash-completion-rpm-cache.patch?r1=1.1&r2=1.2&f=u