[arch-commits] Commit in pacman/trunk (PKGBUILD completion.patch)

Pierre Schmitz pierre at archlinux.org
Wed Apr 7 18:42:35 UTC 2010


    Date: Wednesday, April 7, 2010 @ 14:42:35
  Author: pierre
Revision: 76102

fix completion for xz compresseed packages

Added:
  pacman/trunk/completion.patch
Modified:
  pacman/trunk/PKGBUILD

------------------+
 PKGBUILD         |    8 ++++--
 completion.patch |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-07 18:11:16 UTC (rev 76101)
+++ PKGBUILD	2010-04-07 18:42:35 UTC (rev 76102)
@@ -19,11 +19,13 @@
 source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz
         pacman.conf
         makepkg.conf
-        vercmp.patch)
+        vercmp.patch
+        completion.patch)
 md5sums=('a8cef73d68e2a4c3a46fb46c33210719'
          'abe70dabacee7036368c7afeb686eb10'
          '4d2f2f2ac74cba7bd2d336db9135ab16'
-         '84129116c61c8a7cad03a5ae5d80aee5')
+         '84129116c61c8a7cad03a5ae5d80aee5'
+         '7eddda58bf55809e6bde14b446e41a15')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
@@ -32,6 +34,8 @@
   cd $srcdir/$pkgname-$pkgver
   # avoid linking vercmp against libalpm as this might be broken during a transaction
   patch -p0 -i $srcdir/vercmp.patch || return 1
+  # fix completion for .pkg.tar.xz pacakges (included in next upstream release)
+  patch -p1 -i $srcdir/completion.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
 }

Added: completion.patch
===================================================================
--- completion.patch	                        (rev 0)
+++ completion.patch	2010-04-07 18:42:35 UTC (rev 76102)
@@ -0,0 +1,68 @@
+From d85421ec62cdcd0b4b1f162b9908dc3eb0b704b4 Mon Sep 17 00:00:00 2001
+From: Pierre Schmitz <pierre at archlinux.de>
+Date: Thu, 18 Feb 2010 04:18:10 +0000
+Subject: contrib/*_completion: match *.pkg.tar.*
+
+Signed-off-by: Pierre Schmitz <pierre at archlinux.de>
+Signed-off-by: Dan McGee <dan at archlinux.org>
+---
+diff --git a/contrib/bash_completion b/contrib/bash_completion
+index 62e5bc9..a231eb6 100644
+--- a/contrib/bash_completion
++++ b/contrib/bash_completion
+@@ -321,7 +321,7 @@ _pacman ()
+     case "${op}" in
+       U)
+         COMPREPLY=( $( compgen -d -- "$cur" ) \
+-                    $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
++                    $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) )
+         return 0
+         ;;
+       h|V)
+@@ -336,7 +336,7 @@ _pacman ()
+                       $( compgen -f -- "$cur" ) )
+         elif _instring $mod p; then
+           COMPREPLY=( $( compgen -d -- "$cur" ) \
+-                      $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) )
++                      $( compgen -f -X '!*.pkg.tar.*' -- "$cur" ) )
+         elif _instring $mod u; then
+           COMPREPLY=''
+           return 0
+diff --git a/contrib/zsh_completion b/contrib/zsh_completion
+index 2f43d9b..01b3c44 100644
+--- a/contrib/zsh_completion
++++ b/contrib/zsh_completion
+@@ -32,7 +32,7 @@ _pacman_opts_common=(
+ _pacman_opts_pkgfile=(
+ 	'-d[Skip dependency checks]'
+ 	'-f[Overwrite conflicting files]'
+-	'*:package file:_files -g "*.pkg.tar.gz(.)"'
++	'*:package file:_files -g "*.pkg.tar.*(.)"'
+ )
+ 
+ # options for passing to _arguments: subactions for --query command
+@@ -120,7 +120,7 @@ _pacman_action_query() {
+ 			_arguments -s : \
+ 				"$_pacman_opts_common[@]" \
+ 				"$_pacman_opts_query_modifiers[@]" \
+-				'*:package file:_files -g "*.pkg.tar.gz"'
++				'*:package file:_files -g "*.pkg.tar.*"'
+ 				;;
+ 		query_group)
+ 			_arguments -s : \
+@@ -295,11 +295,11 @@ _pacman() {
+ 				"$_pacman_opts_query_modifiers[@]" \
+ 				'*:package file:_files'
+ 				;;
+-		-Q*p*) # file *.pkg.tar.gz
++		-Q*p*) # file *.pkg.tar.*
+ 			_arguments -s : \
+ 				"$_pacman_opts_common[@]" \
+ 				"$_pacman_opts_query_modifiers[@]" \
+-				'*:package file:_files -g "*.pkg.tar.gz"'
++				'*:package file:_files -g "*.pkg.tar.*"'
+ 				;;
+ 		-Q*)  _pacman_action_query    ;;
+ 		-R*)  _pacman_action_remove   ;;
+--
+cgit v0.8.3.1-3-ga650




More information about the arch-commits mailing list