diff options
| author | LRN <lrn1986@gmail.com> | 2013-03-22 06:07:01 +0000 |
|---|---|---|
| committer | LRN <lrn1986@gmail.com> | 2013-03-22 06:07:01 +0000 |
| commit | b5b8e0a798612a5b5f25ac3d847b0f5a0f2296ce (patch) | |
| tree | 0a276792fa974e900f12d5bd14385dd0da960773 /contrib | |
| parent | 228a41cf6c86d1e6ca058c906d41b8d6be24e907 (diff) | |
| download | gnunet-b5b8e0a798612a5b5f25ac3d847b0f5a0f2296ce.tar.gz gnunet-b5b8e0a798612a5b5f25ac3d847b0f5a0f2296ce.zip | |
Fix the buildslave patch
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/buildslave-0.8.5-gnunet-w32.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/buildslave-0.8.5-gnunet-w32.patch b/contrib/buildslave-0.8.5-gnunet-w32.patch index 291efc47a..8b910fb47 100644 --- a/contrib/buildslave-0.8.5-gnunet-w32.patch +++ b/contrib/buildslave-0.8.5-gnunet-w32.patch | |||
| @@ -49,11 +49,11 @@ diff -urN buildbot-slave-0.8.5.orig/buildslave/runprocess.py buildbot-slave-0.8. | |||
| 49 | +def safe_terminate_process_by_pid (proc, code): | 49 | +def safe_terminate_process_by_pid (proc, code): |
| 50 | + if os.name == 'nt': | 50 | + if os.name == 'nt': |
| 51 | + try: | 51 | + try: |
| 52 | + openproc = win32process.OpenProcess (2 | 1024 | 8 | 32 | 16, 0, proc) | 52 | + openproc = win32api.OpenProcess (2 | 1024 | 8 | 32 | 16, 0, proc) |
| 53 | + try: | 53 | + try: |
| 54 | + d = Dummy () | 54 | + d = Dummy () |
| 55 | + d.SetHandle (openproc) | 55 | + d.SetHandle (openproc) |
| 56 | + safe_termiate_process (d, code) | 56 | + safe_terminate_process (d, code) |
| 57 | + finally: | 57 | + finally: |
| 58 | + win32api.CloseHandle (openproc) | 58 | + win32api.CloseHandle (openproc) |
| 59 | + except: | 59 | + except: |