[arch-commits] Commit in bash-completion/trunk (PKGBUILD modinfo-path.diff)

[Eric Bélanger]

    Date: Sunday, March 18, 2012 @ 02:03:07
  Author: eric
Revision: 153694

upgpkg: bash-completion 1.99-1

Upstream update

Added:
  bash-completion/trunk/modinfo-path.diff
Modified:
  bash-completion/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    7 +++++--
 modinfo-path.diff |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-18 05:39:45 UTC (rev 153693)
+++ PKGBUILD	2012-03-18 06:03:07 UTC (rev 153694)
@@ -10,11 +10,14 @@
 license=('GPL')
 depends=('bash')
 options=('!emptydirs')
-source=("http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('3cf478b7f1065f424d3d6ec35f80e4f2')
+source=(http://bash-completion.alioth.debian.org/files/${pkgname}-${pkgver}.tar.bz2 \
+        modinfo-path.diff)
+md5sums=('3cf478b7f1065f424d3d6ec35f80e4f2'
+         '7047eb6f484323e8d1d22fb260a43a8e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/modinfo-path.diff"
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }

Added: modinfo-path.diff
===================================================================
--- modinfo-path.diff	                        (rev 0)
+++ modinfo-path.diff	2012-03-18 06:03:07 UTC (rev 153694)
@@ -0,0 +1,15 @@
+Subject: [PATCH 1/1] insmod, modprobe: Don't hardcode path to modinfo (Alioth: #313569)
+
+--- a/completions/insmod
++++ b/completions/insmod
+@@ -9,8 +9,8 @@ _insmod()
+ 
+     if [[ $cword -gt 1 && "${words[cword-1]}" != -* ]]; then
+         # do module parameter completion
+-        COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${words[1]} | \
+-            cut -d: -f1 )" -- "$cur" ) )
++        COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" modinfo \
++            -p ${words[1]} 2>/dev/null | cut -d: -f1 )" -- "$cur" ) )
+     else
+         _modules $(uname -r)
+     fi