[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 645aac47909cfbd8e10a27a9cbcbacb13731a3a9

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 645aac47909cfbd8e10a27a9cbcbacb13731a3a9
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Feb 15 11:45:07 2009 +0200

    Fix killall completion for commands with relative paths (RHBZ: #484578), add a FIXME.

diff --git a/bash_completion b/bash_completion
index 3977b1c..b03d79f 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1028,9 +1028,15 @@ _killall()
 	if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then
 		_signals
 	else
+		# FIXME: completes "[kblockd/0]" to "0". Previously it was
+		# completed to "kblockd" which isn't correct either.
+		# "kblockd/0" would be arguably most correct, but killall from
+		# psmisc 22 treats arguments containing "/" specially unless
+		# -r is given so that wouldn't quite work either. Perhaps it'd
+		# be best to not complete these to anything for now.
 		COMPREPLY=( $( compgen -W '$( command ps axo command | \
-			           sed -e "1d; s/ .*//; s:^/.*/::; s/:$//;" \
-			               -e "s/^[[(-]//; s/[])]$//; s:/.*::" \
+			           sed -e "1d; s/ .*//; s:.*/::; s/:$//;" \
+			               -e "s/^[[(-]//; s/[])]$//" \
 				       -e "s/^<defunct>$//")' \
 			           -- $cur ) )
 	fi
diff --git a/debian/changelog b/debian/changelog
index a7142f5..54c0644 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -122,6 +122,7 @@ bash-completion (200902xx) UNRELEASED; urgency=low
   * Fix awk error in "modprobe -r /" completion (Closes: #512556).
   * Expand ~foo to dir name more eagerly to avoid quoting issues.
   * Fix -sourcepath handling in javadoc packages completion.
+  * Fix killall completion for commands with relative paths (RHBZ: #484578).
 
   [ Freddy Vulto ]
   * Restored `_display()' completion for `display' by removing

-- 
bash-completion