changeset 5405:a1a1ce8894cb

merged moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 08 Jan 2010 18:26:38 +0100
parents 06f9718e37a6 (current diff) bf05a6ae61ea (diff)
children a88ddb0f486b
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/util/SubProcess.py	Wed Jan 06 05:30:40 2010 +0100
+++ b/MoinMoin/util/SubProcess.py	Fri Jan 08 18:26:38 2010 +0100
@@ -118,8 +118,8 @@
                 stderr_thread.join(self.timeout)
 
             # if the threads are still alive, that means the thread join timed out
-            timed_out = (self.stdout and self.stdout_thread.isAlive() or
-                         self.stderr and self.stderr_thread.isAlive())
+            timed_out = (self.stdout and stdout_thread.isAlive() or
+                         self.stderr and stderr_thread.isAlive())
             if timed_out:
                 self.kill()
             else: