Merge with stable default tip
authorChristian Ebert <blacktrash@gmx.net>
Fri, 02 May 2014 09:39:06 +0200
changeset 1373 7e193663b0d6
parent 1371 3b0bcc658eef (current diff)
parent 1372 8d921a12dd31 (diff)
Merge with stable
--- a/tests/killdaemons.py	Mon Apr 14 13:21:25 2014 +0100
+++ b/tests/killdaemons.py	Fri May 02 09:39:06 2014 +0200
@@ -43,7 +43,7 @@
             elif r == WAIT_TIMEOUT:
                 logfn('# Daemon process %d is stuck')
             else:
-                check(r) # any error
+                _check(r) # any error
         except: #re-raises
             ctypes.windll.kernel32.CloseHandle(handle) # no _check, keep error
             raise