extras-buildsys/builder builder.py,1.2,1.3

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	builder.py 
Log Message:
2005-06-29  Dan Williams <dcbw at redhat.com>

    * Implement job kill functionality




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- builder.py	28 Jun 2005 02:03:13 -0000	1.2
+++ builder.py	29 Jun 2005 05:22:54 -0000	1.3
@@ -110,8 +110,8 @@
                 os.kill(self._pobj.pid, sig)
             except OSError, e:
                 self.log("Couldn't kill process %d: %s\n" % (self._pobj.pid, e))
-            else:
-                self.log("Killed.\n");
+
+        self.log("Killed.\n");
         self._status = 'killed'
         return True
 
@@ -289,8 +289,9 @@
         if self._status == 'done':
             self.log("Job completed successfully.\n")
         elif self._status == 'failed':
-            exit_status = self._pobj.poll()
-            self.log("Job failed due to mock errors!  mock exit status: %d\n" % exit_status)
+            if self._pobj:
+                exit_status = self._pobj.poll()
+                self.log("Job failed due to mock errors!  mock exit status: %d\n" % exit_status)
         elif self._status == 'killed':
             self.log("Job failed because it was killed.\n")