Author: glen Date: Mon Aug 9 18:54:15 2010 GMT Module: packages Tag: HEAD ---- Log message: - update to 1.2, keep only hrmib export, as it won't be accepted upstream
---- Files affected: packages/bash-completion: bash-completion-rpm-cache.patch (1.10 -> 1.11) ---- Diffs: ================================================================ Index: packages/bash-completion/bash-completion-rpm-cache.patch diff -u packages/bash-completion/bash-completion-rpm-cache.patch:1.10 packages/bash-completion/bash-completion-rpm-cache.patch:1.11 --- packages/bash-completion/bash-completion-rpm-cache.patch:1.10 Sun Oct 11 16:27:59 2009 +++ packages/bash-completion/bash-completion-rpm-cache.patch Mon Aug 9 20:54:10 2010 @@ -1,32 +1,20 @@ -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 <[email protected]> ---- bash-completion-1.1/contrib/rpm~ 2009-10-09 15:49:31.000000000 +0300 -+++ bash-completion-1.1/contrib/rpm 2009-10-10 23:49:53.931350555 +0300 -@@ -7,15 +7,21 @@ - { - local nodig="$1" nosig="$2" +--- 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() + { + # 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 [ -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 && \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bash-completion/bash-completion-rpm-cache.patch?r1=1.10&r2=1.11&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
