[Pkg-zsh-commits] [zsh] 01/01: A05execution-ztst-setopt-MONITOR.patch: Add second occurrence

[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 640ecca39a41f709db392da90d162b2168b3df4f
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 3 08:53:42 2013 +0100

    A05execution-ztst-setopt-MONITOR.patch: Add second occurrence
    
    Also add references to the patch's origins.
---
 .../fix-A05execution-ztst-setopt-MONITOR.patch      | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
index 4e4f1a9..cf1b6ab 100644
--- a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
+++ b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
@@ -1,16 +1,27 @@
 Description: Make A05execution.ztst not fail if setopt MONITOR fails
 Author: Bart E. Schaefer <schaefer at brasslantern.com>
+Origin: http://www.zsh.org/mla/workers/2013/msg01135.html
+Origin: http://www.zsh.org/mla/workers/2013/msg01142.html
 
-diff --git a/Test/A05execution.ztst b/Test/A05execution.ztst
-index ba7e02c..61f6f5a 100644
---- a/Test/A05execution.ztst
-+++ b/Test/A05execution.ztst
+Index: zsh/Test/A05execution.ztst
+===================================================================
+--- zsh.orig/Test/A05execution.ztst	2013-12-03 08:49:42.000000000 +0100
++++ zsh/Test/A05execution.ztst	2013-12-03 08:49:58.000000000 +0100
 @@ -179,7 +179,7 @@
  0:Status reset by starting a backgrounded command
  >0
-
+ 
 -  setopt MONITOR
 +  { setopt MONITOR } 2>/dev/null
    [[ -o MONITOR ]] || print -u $ZTST_fd 'Unable to change MONITOR option'
    repeat 2048; do (return 2 |
                     return 1 |
+@@ -195,7 +195,7 @@
+ F:This test checks for a bug in `$pipestatus[]' handling.  If it breaks then
+ F:the bug is still there or it reappeared. See workers-29973 for details.
+ 
+-  setopt MONITOR
++  { setopt MONITOR } 2>/dev/null
+   externFunc() { awk >/dev/null 2>&1; true; }
+   false | true | false | true | externFunc
+   echo $pipestatus

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