dont_return_from_sourced_script.patch: avoid problems with shells not supporting returning from a sourced script (Closes: #741657)

2 files changed, 26 insertions, 0 deletions

diff --git a/debian/patches/11-dont_return_from_sourced_script.patch b/debian/patches/11-dont_return_from_sourced_script.patch
new file mode 100644
index 00000000..bc761b66
--- /dev/null
+++ b/debian/patches/11-dont_return_from_sourced_script.patch
@@ -0,0 +1,25 @@
+From: Ville Skyttä <ville.skytta@iki.fi>
+Subject: don't return from sourced script
+Origin: upstream, http://anonscm.debian.org/gitweb/?p=bash-completion/bash-completion.git;a=commitdiff;h=867282a
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=741657
+Forwarded: not-needed
+
+---
+ bash_completion.sh.in |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- bash-completion.orig/bash_completion.sh.in
++++ bash-completion/bash_completion.sh.in
+@@ -1,5 +1,5 @@
+ # Check for interactive bash and that we haven't already been sourced.
+-[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION_COMPAT_DIR" ] && return
++if [ -n "$BASH_VERSION" -a -n "$PS1" -a "$BASH_COMPLETION_COMPAT_DIR" ]; then
+ 
+ # Check for recent enough version of bash.
+ bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+@@ -12,3 +12,5 @@ if [ $bmajor -gt 4 ] || [ $bmajor -eq 4
+     fi
+ fi
+ unset bash bmajor bminor
++
++fi
diff --git a/debian/patches/series b/debian/patches/series
index c9c3c797..fb225a29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 08-dpkg_fix_-W_option.patch
 09-aptitude_safe-upgrade.patch
 10-ifconfig_locale.patch
+11-dont_return_from_sourced_script.patch