Author: glen Date: Mon Apr 13 13:40:36 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- update to 1.0
---- Files affected:
SOURCES:
bash-completion-rpm-cache.patch (1.5 -> 1.6) , bash-completion-mplayer.patch
(1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/bash-completion-rpm-cache.patch
diff -u SOURCES/bash-completion-rpm-cache.patch:1.5
SOURCES/bash-completion-rpm-cache.patch:1.6
--- SOURCES/bash-completion-rpm-cache.patch:1.5 Thu Apr 2 18:07:38 2009
+++ SOURCES/bash-completion-rpm-cache.patch Mon Apr 13 15:40:30 2009
@@ -1,10 +1,14 @@
---- bash-completion/bash_completion~ 2009-04-02 18:56:57.000000000 +0300
-+++ bash-completion/bash_completion 2009-04-02 18:58:54.003383671 +0300
-@@ -1836,29 +1836,26 @@
+--- bash-completion-1.0/bash_completion~ 2009-04-13 16:21:42.000000000
+0300
++++ bash-completion-1.0/bash_completion 2009-04-13 16:28:42.911409892
+0300
+@@ -1940,17 +1940,30 @@
#
_rpm_installed_packages()
{
-- local ver nodig nosig
+- local ver nodig="$1" nosig="$2"
++ local nodig="$1" nosig="$2"
+
+- if [ -r /var/log/rpmpkgs -a \
+- /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
+ # 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') )
@@ -12,37 +16,24 @@
+ fi
+
+ # refresh cache if writable
-+ if [ /var/log/rpmpkgs -ot /var/lib/rpm/Packages -a -w /var/log/rpmpkgs
]; then
++ 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
-+ local tmp=$(rpm -qa --nodigest --nosignature --qf
'%{name}-%{version}-%{release}.%{arch}.rpm\n' | LC_ALL=C sort)
-+ echo "$tmp" > /var/log/rpmpkgs
++ _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
-+ 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...@]\+.*\.rpm$|\1|p' \
+-
's|^\('$cur'[^[:space:]]*\)-[^[:space:]-]\+-[^[:space:]-]\+\.rpm$|\1|p' \
- /var/log/rpmpkgs ) )
+ 's|^\('$cur'.*\)\.rpm$|\1|p' \
-+ /var/log/rpmpkgs ) )
++ /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...@]\+$|\1|p' ) )
-+ COMPREPLY=( $( rpm -qa --nodigest --nosignature --qf
'%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
+ _rpm_nodigsig
+- COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) )
++ COMPREPLY=( $( rpm -qa $nodig $nosig --qf
'%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
fi
}
================================================================
Index: SOURCES/bash-completion-mplayer.patch
diff -u SOURCES/bash-completion-mplayer.patch:1.3
SOURCES/bash-completion-mplayer.patch:1.4
--- SOURCES/bash-completion-mplayer.patch:1.3 Thu Apr 2 18:28:59 2009
+++ SOURCES/bash-completion-mplayer.patch Mon Apr 13 15:40:31 2009
@@ -1,11 +1,11 @@
---- bash-completion/bash_completion~ 2009-04-02 18:59:35.000000000 +0300
-+++ bash-completion/bash_completion 2009-04-02 19:01:46.032949230 +0300
-@@ -6056,7 +6056,7 @@
+--- bash-completion-1.0/bash_completion~ 2009-04-13 16:29:17.000000000
+0300
++++ bash-completion-1.0/bash_completion 2009-04-13 16:29:55.580988051
+0300
+@@ -6174,7 +6174,7 @@
-xvidencopts -of --verbose' -- $cur) )
;;
*)
-- _filedir
'@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS)'
-+ _filedir
'@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[34]|MP[34]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|flv|FLV)'
+- _filedir
'@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE)'
++ _filedir
'@(mp?(e)g|MP?(E)G|wm[av]|WM[AV]|avi|AVI|asf|ASF|vob|VOB|bin|BIN|dat|DAT|vcd|VCD|ps|PS|pes|PES|fl[iv]|FL[IV]|viv|VIV|rm?(j)|RM?(J)|ra?(m)|RA?(M)|yuv|YUV|mov|MOV|qt|QT|mp[234]|MP[234]|m4[av]|M4[AV]|og[gmavx]|OG[GMAVX]|w?(a)v|W?(A)V|dump|DUMP|mk[av]|MK[AV]|m4a|M4A|aac|AAC|m2v|M2V|dv|DV|rmvb|RMVB|mid|MID|ts|TS|3g[p2]|mpc|MPC|flac|FLAC|vro|VRO|divx|DIVX|aif?(f)|AIF?(F)|m2ts|M2TS|vdr|VDR|xvid|XVID|ape|APE|flv|FLV)'
;;
esac
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bash-completion-rpm-cache.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bash-completion-mplayer.patch?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
