diff options
| author | Axel Beckert <abe@deuxchevaux.org> | 2014-10-13 22:42:04 +0200 |
|---|---|---|
| committer | Axel Beckert <abe@deuxchevaux.org> | 2014-10-13 22:42:04 +0200 |
| commit | 849017f2c7c6be567302dbd3fa8257aa8c9f9b18 (patch) | |
| tree | 5309bc082e69eb9f8598ba0c78dde6780eac96fb | |
| parent | 46859b9c7f8539d85c67508c789c938d29d47a3e (diff) | |
| download | zsh-849017f2c7c6be567302dbd3fa8257aa8c9f9b18.tar.gz zsh-849017f2c7c6be567302dbd3fa8257aa8c9f9b18.zip | |
Cherry-pick 22c4ea42 (33403: be conservative about redirecting _call_program stderr, the caller may have already done so) from upstream
| -rw-r--r-- | debian/patches/cherry-pick-22c4ea42-33403-be-conservative-about-redirecting-call-program-stderr-the-caller-may-have-already-done-so.patch | 20 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 21 insertions, 0 deletions
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 000000000..bc1dcac9c --- /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@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 c84ec75f8..8f45cdf1d 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 |