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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit ef025a78ab3fbba36ce9e3a32786d43e75c711ab
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 23 00:29:16 2009 +0200

    Try to install/test arch completion only for the mailman one, not coreutils/util-linux-ng.

diff --git a/contrib/mailman b/contrib/mailman
index 3265cf5..d3012da 100644
--- a/contrib/mailman
+++ b/contrib/mailman
@@ -378,7 +378,9 @@ _config_list()
 } &&
 complete -F _config_list -o filenames config_list
 
-have arch &&
+# Try to detect whether this is the mailman "arch" to avoid installing
+# it for the coreutils/util-linux-ng one.
+have arch && have mailmanctl &&
 _arch()
 {
     local cur prev split=false
diff --git a/test/completion/arch.exp b/test/completion/arch.exp
index 5b0d906..21066e4 100644
--- a/test/completion/arch.exp
+++ b/test/completion/arch.exp
@@ -1,3 +1,3 @@
-if {[assert_bash_type {arch}]} {
+if {[assert_bash_type {arch}] && [assert_bash_type {mailmanctl}]} {
     source "lib/completions/arch.exp"
 }; # if

-- 
bash-completion