| 1 |
slords |
1.1 |
diff -Nur plague-0.4.4.1-orig/builder/builder.py plague-0.4.4.1/builder/builder.py |
| 2 |
|
|
--- plague-0.4.4.1-orig/builder/builder.py 2006-03-13 16:09:23.000000000 +0100 |
| 3 |
|
|
+++ plague-0.4.4.1/builder/builder.py 2007-11-15 21:15:05.000000000 +0100 |
| 4 |
|
|
@@ -132,13 +132,13 @@ |
| 5 |
|
|
def _handle_death(self): |
| 6 |
|
|
self._die = False |
| 7 |
|
|
self._done_status = 'killed' |
| 8 |
|
|
- self._log("Killing build process...\n") |
| 9 |
|
|
|
| 10 |
|
|
# Don't try to kill a running cleanup process |
| 11 |
|
|
if self._status != 'cleanup': |
| 12 |
|
|
# Kill a running non-cleanup mock process, if any |
| 13 |
|
|
if self._childpid: |
| 14 |
|
|
child_pgroup = 0 - self._childpid |
| 15 |
|
|
+ self._log("Killing build process group of child pid %d...\n" % self._childpid) |
| 16 |
|
|
try: |
| 17 |
|
|
# Kill all members of the child's process group |
| 18 |
|
|
os.kill(child_pgroup, 9) |
| 19 |
|
|
@@ -146,12 +146,12 @@ |
| 20 |
|
|
self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e)) |
| 21 |
|
|
else: |
| 22 |
|
|
# Ensure child process is reaped |
| 23 |
|
|
- self._log("Waiting for mock process %d to exit...\n" % self._childpid) |
| 24 |
|
|
+ self._log("Waiting for child process group to exit...\n") |
| 25 |
|
|
try: |
| 26 |
|
|
- (pid, status) = os.waitpid(self._childpid, 0) |
| 27 |
|
|
+ (pid, status) = os.waitpid(child_pgroup, 0) |
| 28 |
|
|
except OSError, e: |
| 29 |
|
|
pass |
| 30 |
|
|
- self._log("Mock process %d exited.\n" % self._childpid) |
| 31 |
|
|
+ self._log("Build processes exited.\n") |
| 32 |
|
|
self._childpid = 0 |
| 33 |
|
|
|
| 34 |
|
|
# Start cleanup up the job |
Parent Directory
| 
Revision Log
| 
Revision Graph
