Changeset View
Changeset View
Standalone View
Standalone View
head/devel/ice/files/patch-scripts-Expect.py
| --- scripts/Expect.py.orig 2013-03-11 15:19:47.000000000 +0000 | --- scripts.orig/Expect.py 2015-01-23 13:16:01.000000000 +0000 | ||||
| +++ scripts/Expect.py 2014-09-08 22:32:43.000000000 +0000 | +++ scripts/Expect.py 2015-01-23 13:21:06.526614131 +0000 | ||||
| @@ -461,7 +461,7 @@ | @@ -484,7 +484,7 @@ | ||||
| if win32 and self.exitstatus != 0 and self.killed is not None: | global processes | ||||
| self.exitstatus = -self.killed | del processes[self.p.pid] | ||||
| self.p = None | self.p = None | ||||
| - self.r.join() | - self.r.join() | ||||
| + self.r.join(timeout) | + self.r.join(timeout) | ||||
| # Simulate a match on EOF | # Simulate a match on EOF | ||||
| self.buf = self.r.getbuf() | self.buf = self.r.getbuf() | ||||
| self.before = self.buf | self.before = self.buf | ||||