extras-buildsys/builder builder.py,1.27,1.28

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * builder/builder.py
        - (_mock_done): hand-wavy attempt to ensure the mock child process
            is always reaped

    * client/client.py
        - (enqueue, enqueue_srpm): Print out returned job UID
        - (detail_job): remove bogus email argument

    * server/BuildMaster.py
        - (create_job_request): new function to consolidate job request creation
        - (enqueue, enqueue_srpm): consolidate to one enqueue() function since
            the database really makes no distinction between CVS and SRPM jobs
        - (_start_new_jobs): return UID to requester when we become aware of it

    * server/UserInterface.py
        - (_wait_for_uid): new function, waits max 3 seconds for the BuildMaster
            to return the new job's UID
        - (enqueue, enqueue_srpm): use create_job_request(), and wait for the
            job's UID to be returned from the BuildMaster, which we then pass
            back to the client
        - (detail_job): remove bogus email argument
        - (_kill_job): warn user if the job is no longer building or waiting to
            be added to the repo.  We can't kill jobs if they are no longer building.

    * www/job.psp
        - detail_job()'s email argument got removed, remove it here to




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- builder.py	1 Aug 2005 17:26:46 -0000	1.27
+++ builder.py	5 Aug 2005 16:24:07 -0000	1.28
@@ -298,6 +298,10 @@
                     os.fsync(self._log_fd.fileno())
 
     def _mock_done(self):
+        # Ensure child mock is reaped
+        if self._pobj:
+            self._pobj.poll()
+
         self._files = self._find_files()
         self.log("\n\n-----------------------\n\n")
         if self._status == 'done':