extras-buildsys/builder builder.py, 1.44.2.8.2.1.2.1, 1.44.2.8.2.1.2.2

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7679/builder

Modified Files:
      Tag: Plague-0_4_5
	builder.py 
Log Message:
plague-0.4.4.1-kill.patch




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Attic/builder.py,v
retrieving revision 1.44.2.8.2.1.2.1
retrieving revision 1.44.2.8.2.1.2.2
diff -u -r1.44.2.8.2.1.2.1 -r1.44.2.8.2.1.2.2
--- builder.py	31 Jan 2008 14:04:49 -0000	1.44.2.8.2.1.2.1
+++ builder.py	31 Jan 2008 14:06:58 -0000	1.44.2.8.2.1.2.2
@@ -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