[Bash-completion-commits] ./current r1306: Prevent completion dir from being sourced twice if BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433)

[Freddy Vulto]

------------------------------------------------------------
revno: 1306
committer: Freddy Vulto <fvulto at gmail.com>
branch nick: bash-completion-devel
timestamp: Wed 2009-02-04 00:05:23 +0100
message:
  Prevent completion dir from being sourced twice if BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433)
modified:
  bash_completion
  debian/changelog
-------------- next part --------------
=== modified file 'bash_completion'
--- a/bash_completion	2009-02-03 19:38:27 +0000
+++ b/bash_completion	2009-02-03 23:05:23 +0000
@@ -9299,6 +9299,7 @@
 	done
 fi
 if [ -d $BASH_COMPLETION_DIR -a -r $BASH_COMPLETION_DIR -a \
+     $BASH_COMPLETION_DIR != $BASH_COMPLETION_COMPAT_DIR -a \
      -x $BASH_COMPLETION_DIR ]; then
 	for i in $BASH_COMPLETION_DIR/*; do
 		[[ ${i##*/} != @(*~|*.bak|*.swp|\#*\#|*.dpkg*|*.rpm@(orig|new|save)) ]] &&

=== modified file 'debian/changelog'
--- a/debian/changelog	2009-02-03 19:38:27 +0000
+++ b/debian/changelog	2009-02-03 23:05:23 +0000
@@ -119,8 +119,10 @@
   * Restored `_display()' completion for `display' by removing
     completion-by-extension for `display' (Alioth#311429)
   * Removed duplicate completion option `-borderwidth' for `display'
+  * Prevent completion dir from being sourced twice if
+    BASH_COMPLETION_DIR and BASH_COMPLETION_COMPAT_DIR are equal (Alioth#311433) 
 
- -- Freddy Vulto <fvulto at gmail.com>  Sun,  1 Feb 2009 23:59:39 +0100
+ -- Freddy Vulto <fvulto at gmail.com>  Wed,  4 Feb 2009 00:05:03 +0100
 
 bash-completion (20080705) unstable; urgency=low