[Bash-completion-commits] ./current r1221: * Merge from Ubuntu:

David Paleino d.paleino at gmail.com
Thu Jan 8 15:35:03 UTC 2009


------------------------------------------------------------
revno: 1221
committer: David Paleino <d.paleino at gmail.com>
branch nick: bash-completion
timestamp: Thu 2009-01-08 16:35:03 +0100
message:
  * Merge from Ubuntu:
    - redirect stderr to stdout in _configure_func()
    - missing quotes in _filedir_xspec()
modified:
  bash_completion
  debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2008-12-19 20:58:21 +0000
+++ b/bash_completion	2009-01-08 15:35:03 +0000
@@ -4997,10 +4997,9 @@
 	[[ "$cur" != -* ]] && return 0
 
 	if [ -n "$COMP_CONFIGURE_HINTS" ]; then
-		COMPREPLY=( $( $1 --help | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | grep ^$cur ) )
-
+		COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | grep ^$cur ) )
 	else
-		COMPREPLY=( $( $1 --help | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | grep ^$cur ) )
+		COMPREPLY=( $( $1 --help 2>&1 | awk '/^  --[A-Za-z]/ { print $1; if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | grep ^$cur ) )
 	fi
 }
 complete -F _configure_func $default configure
@@ -9181,7 +9180,7 @@
 	))
 	
 	toks=( ${toks[@]-} $(
-		eval compgen -f -X $xspec -- "\$(quote_readline "\$cur")" | {
+		eval compgen -f -X "$xspec" -- "\$(quote_readline "\$cur")" | {
 			while read -r tmp; do
 				[ -n $tmp ] && echo $tmp
 			done

=== modified file 'debian/changelog'
--- a/debian/changelog	2008-12-19 21:20:22 +0000
+++ b/debian/changelog	2009-01-08 15:35:03 +0000
@@ -55,13 +55,16 @@
       on things like pattern rules. Patch by Mike Kelly <pioto at exherbo.org>.
     - complete on gkrellm2 as well. Patch by Aaron Walker.
     - fix CVS completion
+  * Merge from Ubuntu:
+    - redirect stderr to stdout in _configure_func()
+    - missing quotes in _filedir_xspec()
   * debian/links fixed (Closes: #494292)
   * debian/control:
     - fixed typo in the long description
   * debian/install:
     - correctly install contrib/* under /etc/bash_completion.d/
 
- -- David Paleino <d.paleino at gmail.com>  Fri, 19 Dec 2008 21:59:29 +0100
+ -- David Paleino <d.paleino at gmail.com>  Thu, 08 Jan 2009 16:32:15 +0100
 
 bash-completion (20080705) unstable; urgency=low
 



More information about the Bash-completion-commits mailing list