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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 1110fcadb18b86234763309b5bf6927f1deb480a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Dec 18 12:56:28 2010 +0200

    Do not load bash_completion in profile.d script if progcomp is not enabled.

diff --git a/CHANGES b/CHANGES
index 51489da..6f43f65 100644
--- a/CHANGES
+++ b/CHANGES
@@ -39,6 +39,7 @@ bash-completion (2.x)
     dynamically when needed instead.
   * Add/improve various autotools completions.
   * Add *.apk to unzip and jar filename completions.
+  * Do not load bash_completion in profile.d script if progcomp is not enabled.
 
   [ Freddy Vulto ]
   * Added _tilde(), fix ~username completion (Alioth: #312613, Debian: #587095)
diff --git a/bash_completion.sh.in b/bash_completion.sh.in
index bdddeee..f6a983f 100644
--- a/bash_completion.sh.in
+++ b/bash_completion.sh.in
@@ -4,7 +4,7 @@
 # Check for recent enough version of bash.
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
 if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then
-    if [ -r @sysconfdir@/bash_completion ]; then
+    if shopt -q progcomp && [ -r @sysconfdir@/bash_completion ]; then
         # Source completion code.
         . @sysconfdir@/bash_completion
     fi

-- 
bash-completion