]>
Commit | Line | Data |
---|---|---|
a8015381 ER |
1 | --- bash-completion/contrib/rpm~ 2009-07-21 06:28:45.000000000 +0300 |
2 | +++ bash-completion/contrib/rpm 2009-07-21 06:37:08.381279143 +0300 | |
3 | @@ -6,17 +6,31 @@ | |
8369e198 ER |
4 | # |
5 | _rpm_installed_packages() | |
24e31c9e | 6 | { |
530fe0ad ER |
7 | - local ver nodig="$1" nosig="$2" |
8 | + local nodig="$1" nosig="$2" | |
a8015381 | 9 | + |
d828dd63 ER |
10 | + # if rpm (4.4.7+) is configured to export it's rpmdb to /var/cache/hrmib (%_hrmib_path) |
11 | + if [ -d /var/cache/hrmib -a -r /var/cache/hrmib ]; then | |
12 | + COMPREPLY=( $( LC_ALL=C command ls -1 /var/cache/hrmib | sed -ne '/^'$cur'/p') ) | |
13 | + return | |
14 | + fi | |
15 | + | |
a8015381 | 16 | + # refresh cache if writable. FHS location |
530fe0ad | 17 | + if [ -w /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages ]; then |
24e31c9e | 18 | + # we grab the output to local variable to prevent possible race |
530fe0ad ER |
19 | + _rpm_nodigsig |
20 | + local tmp=$(rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n') | |
21 | + echo "$tmp" > /var/cache/rpmpkgs.txt | |
24e31c9e | 22 | + fi |
a8015381 ER |
23 | |
24 | if [ -r /var/log/rpmpkgs -a \ | |
25 | /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then | |
24e31c9e ER |
26 | # using RHL 7.2 or later - this is quicker than querying the DB |
27 | COMPREPLY=( $( sed -ne \ | |
530fe0ad | 28 | - 's|^\('$cur'[^[:space:]]*\)-[^[:space:]-]\+-[^[:space:]-]\+\.rpm$|\1|p' \ |
8369e198 | 29 | + 's|^\('$cur'.*\)\.rpm$|\1|p' \ |
a8015381 | 30 | /var/log/rpmpkgs ) ) |
8369e198 | 31 | else |
530fe0ad ER |
32 | _rpm_nodigsig |
33 | - COMPREPLY=( $( rpm -qa $nodig $nosig --qf='%{NAME} ' "$cur*" ) ) | |
a8015381 | 34 | + COMPREPLY=( $( rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) ) |
8369e198 ER |
35 | fi |
36 | } | |
37 |