- split and rediff patches for easier upstream merge

Changed files:
    bash-completion-FHS.patch -> 1.4
    bash-completion-rpm-arch.patch -> 1.5
    bash-completion-rpm-cache.patch -> 1.1

diff --git a/bash-completion-FHS.patch b/bash-completion-FHS.patch
index 2aa81192d78b5a3023fb838a0d05769cf512d338..b6e6faa1a9755d601fb506a2520f985243cc64b7 100644 (file)
--- a/bash-completion-FHS.patch
+++ b/bash-completion-FHS.patch
@@ -1,22 +1,24 @@
---- bash_completion/bash_completion    2005-01-04 08:37:42.000000000 +0200
-+++ /tmp/bash_completion       2006-01-02 20:18:52.000000000 +0200
-@@ -1718,12 +1723,16 @@
- {
-       local i
+--- bash_completion/bash_completion    2006-03-01 22:00:59.000000000 +0200
++++ bash_completion    2006-03-01 22:06:19.000000000 +0200
+@@ -1735,17 +1735,17 @@
+       local ver nodig nosig
  
--      if [ -r /var/log/rpmpkgs -a \
--              /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
-+      # refresh cache if writable
-+      if [ -w /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages ]; then
-+              rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' | LC_ALL=C sort > /var/cache/rpmpkgs.txt
-+      fi
-+
+       # 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
++              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' \
+               's|^\('$cur'.*\)\.rpm$|\1|p' \
 -                              /var/log/rpmpkgs ) )
 +                              /var/cache/rpmpkgs.txt ) )
        else
-               COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
-               's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
+               nodig=""
+               nosig=""

diff --git a/bash-completion-rpm-arch.patch b/bash-completion-rpm-arch.patch
index 3a90351371edfb3eee651d05abc3118ef85f0cc3..051bc4082e56923d84b218d13c5658f616ccb9c9 100644 (file)
--- a/bash-completion-rpm-arch.patch
+++ b/bash-completion-rpm-arch.patch
@@ -1,12 +1,12 @@
 --- bash_completion/bash_completion~   2006-03-01 21:23:16.000000000 +0200
 +++ bash_completion/bash_completion    2006-03-01 21:28:37.000000000 +0200
 @@ -1742,7 +1742,7 @@
-       if [ -r /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -nt /var/lib/rpm/Packages ]; then
+       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'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
 +              's|^\('$cur'.*\)\.rpm$|\1|p' \
-                               /var/cache/rpmpkgs.txt ) )
+                               /var/log/rpmpkgs ) )
        else
                nodig=""
 @@ -1757,8 +1757,7 @@

diff --git a/bash-completion-rpm-cache.patch b/bash-completion-rpm-cache.patch
new file mode 100644 (file)
index 0000000..468f959
--- /dev/null
+++ b/bash-completion-rpm-cache.patch
@@ -0,0 +1,19 @@
+--- 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 @@
+ {
+       local ver nodig nosig
+ 
+-      if [ -r /var/log/rpmpkgs -a \
+-              /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
++      # refresh cache if writable
++      if [ /var/log/rpmpkgs -ot /var/lib/rpm/Packages -a -w /var/log/rpmpkgs ]; 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
++      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'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \