cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport fix from upstream, effectively unbreaking cvs completion

Browse Source 
ok jca@, pea@ (MAINTAINER)
This commit is contained in:
jasper 2015-04-28 06:30:13 +00:00
parent 74e47b09d6
commit 31fbb69ad0
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shells/zsh/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.73 2015/04/22 11:52:40 jca Exp $
# $OpenBSD: Makefile,v 1.74 2015/04/28 06:30:13 jasper Exp $
COMMENT= Z shell, Bourne shell-compatible
V= 5.0.7
DISTNAME= zsh-$V
REVISION= 0
CATEGORIES= shells
MAINTAINER= Pierre-Emmanuel Andre <pea@openbsd.org>

19
shells/zsh/patches/patch-Completion_Base_Utility__call_program Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-Completion_Base_Utility__call_program,v 1.1 2015/04/28 06:30:13 jasper Exp $
be conservative about redirecting _call_program stderr, the caller may have
already done so
http://sourceforge.net/p/zsh/code/ci/22c4ea424ce2e8febce04d324c5ec9898f5d534b/
--- Completion/Base/Utility/_call_program.orig Sat Apr 25 20:20:25 2015
+++ Completion/Base/Utility/_call_program Sat Apr 25 20:20:38 2015
@@ -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