From 4aff7c172aea9ed50e57dd8d72b07f14e933eea3 Mon Sep 17 00:00:00 2001 From: Michael Gmelin Date: Mon, 13 Jul 2015 19:48:31 +0000 Subject: Update devel/ice, devel/py-ice and devel/php5-ice to 3.6.0 PR: 201143 Differential Revision: https://reviews.freebsd.org/D2930 Reviewed by: bapt Approved by: bapt Tested by: Roger Leigh --- devel/ice/files/patch-scripts-Expect.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'devel/ice/files/patch-scripts-Expect.py') diff --git a/devel/ice/files/patch-scripts-Expect.py b/devel/ice/files/patch-scripts-Expect.py index d73c2adcffc6..8072c6b69ce9 100644 --- a/devel/ice/files/patch-scripts-Expect.py +++ b/devel/ice/files/patch-scripts-Expect.py @@ -1,11 +1,11 @@ ---- scripts/Expect.py.orig 2013-03-11 15:19:47.000000000 +0000 -+++ scripts/Expect.py 2014-09-08 22:32:43.000000000 +0000 -@@ -461,7 +461,7 @@ - if win32 and self.exitstatus != 0 and self.killed is not None: - self.exitstatus = -self.killed - self.p = None -- self.r.join() -+ self.r.join(timeout) - # Simulate a match on EOF - self.buf = self.r.getbuf() - self.before = self.buf +--- scripts.orig/Expect.py 2015-01-23 13:16:01.000000000 +0000 ++++ scripts/Expect.py 2015-01-23 13:21:06.526614131 +0000 +@@ -484,7 +484,7 @@ + global processes + del processes[self.p.pid] + self.p = None +- self.r.join() ++ self.r.join(timeout) + # Simulate a match on EOF + self.buf = self.r.getbuf() + self.before = self.buf -- cgit v1.2.3