--- 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 + # refresh cache if writable + 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 --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/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' \ - /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 }