[Bash-completion-commits] [SCM] debian-package branch, master, updated. debian/1.99-2-1-ge45a409

[David Paleino]

The following commit has been merged in the master branch:
commit e45a4096e8a8cf6e2997687693a009a439c5f829
Author: David Paleino <dapal at debian.org>
Date:   Wed Jan 11 14:39:57 2012 +0100

    Fixed issue when loading completions from the /etc/bash_completion symlink.

diff --git a/debian/changelog b/debian/changelog
index 78273e2..c11f7ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bash-completion (1:1.99-3) UNRELEASED; urgency=low
+
+  * Fixed issue when loading completions from the /etc/bash_completion
+    symlink.
+
+ -- David Paleino <dapal at debian.org>  Wed, 11 Jan 2012 14:39:37 +0100
+
 bash-completion (1:1.99-2) unstable; urgency=low
 
   * Make /etc/bash_completion a symlink to the new location, waiting
diff --git a/debian/patches/00-fix_symlink_issue.patch b/debian/patches/00-fix_symlink_issue.patch
new file mode 100644
index 0000000..5ee6066
--- /dev/null
+++ b/debian/patches/00-fix_symlink_issue.patch
@@ -0,0 +1,30 @@
+From: Jonathan Nieder <jrnieder at gmail.com>
+Subject: fix issue when loading bash-completion from a symlink
+Forwarded: not-needed
+
+---
+ bash_completion |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- bash-completion.orig/bash_completion
++++ bash-completion/bash_completion
+@@ -1916,7 +1916,8 @@ _minimal()
+ _completion_loader()
+ {
+     local compdir=./completions
+-    [[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
++    local compscript=$(readlink -f $BASH_SOURCE)
++    [[ $compscript == */* ]] && compdir="${compscript%/*}/completions"
+ 
+     # Try basename.
+     . "$compdir/${1##*/}" &>/dev/null && return 124
+@@ -1937,7 +1938,8 @@ _xfunc()
+     shift
+     declare -F $1 &>/dev/null || {
+         local compdir=./completions
+-        [[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
++        local compscript=$(readlink -f $BASH_SOURCE)
++        [[ $compscript == */* ]] && compdir="${compscript%/*}/completions"
+         . "$compdir/$srcfile"
+     }
+     "$@"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4f77fe9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+00-fix_symlink_issue.patch

-- 
debian-package