summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2013-12-15 01:47:13 +0100
committerAxel Beckert <abe@deuxchevaux.org>2013-12-15 01:47:13 +0100
commit97ed366a27c0cd4c661f7eecac849909b815e938 (patch)
tree628edd895734e061fcc7bd796d5f974d1874ebd9
parentafe5329e4201123395ea9b6bc5f88cb5cb83d20d (diff)
downloadzsh-97ed366a27c0cd4c661f7eecac849909b815e938.tar.gz
zsh-97ed366a27c0cd4c661f7eecac849909b815e938.zip
Drop fix-A05execution-ztst-setopt-MONITOR.patch (applied upstream)
-rw-r--r--debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch27
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch b/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
deleted file mode 100644
index cf1b6ab22..000000000
--- a/debian/patches/fix-A05execution-ztst-setopt-MONITOR.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Make A05execution.ztst not fail if setopt MONITOR fails
-Author: Bart E. Schaefer <schaefer@brasslantern.com>
-Origin: http://www.zsh.org/mla/workers/2013/msg01135.html
-Origin: http://www.zsh.org/mla/workers/2013/msg01142.html
-
-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
diff --git a/debian/patches/series b/debian/patches/series
index e1df562db..2268b4303 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
replace-texi2html-with-makeinfo
use-dev-null-instead-of-dev-tty-for-dash-c-test.patch
-fix-A05execution-ztst-setopt-MONITOR.patch