[Bash-completion-commits] [debian] 01/02: Fix dont_return_from_sourced_script.patch: typo during the patch backport (Closes: #742362)

David Paleino dapal at debian.org
Sat Mar 22 21:03:58 UTC 2014


This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit 621a75eaa30563899d4f6b60f4409be410a60cd4
Author: David Paleino <dapal at debian.org>
Date:   Sat Mar 22 21:57:38 2014 +0100

    Fix dont_return_from_sourced_script.patch: typo during the patch backport (Closes: #742362)
---
 debian/changelog                                        | 7 +++++++
 debian/patches/11-dont_return_from_sourced_script.patch | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7f9ba88..971875b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bash-completion (1:2.1-4) UNRELEASED; urgency=medium
+
+  * Fix dont_return_from_sourced_script.patch: typo during the patch
+    backport (Closes: #742362)
+
+ -- David Paleino <dapal at debian.org>  Sat, 22 Mar 2014 21:56:42 +0100
+
 bash-completion (1:2.1-3) unstable; urgency=medium
 
   * Import patch from Ubuntu:
diff --git a/debian/patches/11-dont_return_from_sourced_script.patch b/debian/patches/11-dont_return_from_sourced_script.patch
index bc761b6..c023ed8 100644
--- a/debian/patches/11-dont_return_from_sourced_script.patch
+++ b/debian/patches/11-dont_return_from_sourced_script.patch
@@ -13,7 +13,7 @@ Forwarded: not-needed
 @@ -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
++if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
  
  # Check for recent enough version of bash.
  bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git



More information about the Bash-completion-commits mailing list