diff -Nur plague-0.4.4.1-orig/builder/builder.py plague-0.4.4.1/builder/builder.py --- plague-0.4.4.1-orig/builder/builder.py 2006-03-13 16:09:23.000000000 +0100 +++ plague-0.4.4.1/builder/builder.py 2007-11-15 21:15:05.000000000 +0100 @@ -132,13 +132,13 @@ def _handle_death(self): self._die = False self._done_status = 'killed' - self._log("Killing build process...\n") # Don't try to kill a running cleanup process if self._status != 'cleanup': # Kill a running non-cleanup mock process, if any if self._childpid: child_pgroup = 0 - self._childpid + self._log("Killing build process group of child pid %d...\n" % self._childpid) try: # Kill all members of the child's process group os.kill(child_pgroup, 9) @@ -146,12 +146,12 @@ self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e)) else: # Ensure child process is reaped - self._log("Waiting for mock process %d to exit...\n" % self._childpid) + self._log("Waiting for child process group to exit...\n") try: - (pid, status) = os.waitpid(self._childpid, 0) + (pid, status) = os.waitpid(child_pgroup, 0) except OSError, e: pass - self._log("Mock process %d exited.\n" % self._childpid) + self._log("Build processes exited.\n") self._childpid = 0 # Start cleanup up the job