[Pkg-zsh-commits] [zsh] 03/09: Cherry-pick 22c4ea42 (33403: be conservative about redirecting _call_program stderr, the caller may have already done so) from upstream

[Axel Beckert]

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

abe pushed a commit to branch debian
in repository zsh.

commit 849017f2c7c6be567302dbd3fa8257aa8c9f9b18
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Oct 13 22:42:04 2014 +0200

    Cherry-pick 22c4ea42 (33403: be conservative about redirecting _call_program stderr, the caller may have already done so) from upstream
---
 ...-stderr-the-caller-may-have-already-done-so.patch | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch b/debian/patches/cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch
new file mode 100644
index 0000000..bc1dcac
--- /dev/null
+++ b/debian/patches/cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch
@@ -0,0 +1,20 @@
+Origin: commit 22c4ea424ce2e8febce04d324c5ec9898f5d534b
+Author: Barton E. Schaefer <schaefer at zsh.org>
+Date:   Thu Oct 9 17:54:47 2014 -0700
+Description: 33403: be conservative about redirecting _call_program stderr, the caller may have already done so
+
+diff --git a/Completion/Base/Utility/_call_program b/Completion/Base/Utility/_call_program
+index b657648..010e094 100644
+--- a/Completion/Base/Utility/_call_program
++++ b/Completion/Base/Utility/_call_program
+@@ -2,8 +2,8 @@
+ 
+ local tmp err_fd=-1
+ 
+-if (( ${debug_fd:--1} > 2 ))
+-then exec {err_fd}>&2	# debug_fd is saved stderr, 2 is log file
++if (( ${debug_fd:--1} > 2 )) || [[ ! -t 2 ]]
++then exec {err_fd}>&2	# debug_fd is saved stderr, 2 is trace or redirect
+ else exec {err_fd}>/dev/null
+ fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index c84ec75..8f45cdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ replace-texi2html-with-makeinfo
 cherry-pick-9982ab6f-missing-changelog-entry
 cherry-pick-0f73b35f-33391-vcs-info-git-fix-applied-patch-detection-on-git-am.patch
 cherry-pick-a03227de-33405-vcs-info-make-sure-maxexports-is-set-when-vcs-info-set-is-called.patch
+cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git