extras-buildsys/server BuildMaster.py,1.16,1.17 Repo.py,1.10,1.11

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	BuildMaster.py Repo.py 
Log Message:
2005-07-18  Dan Williams <dcbw at redhat.com>

   * builder/builder.py
        - Don't start a cleanup over top of another cleanup
            when we're told to kill the job

    * server/BuildMaster.py
      server/Repo.py
        - Clear repo additions array after each repo update, fixes problem
            where jobs would switch back from 'needsign' -> 'repodone' after
            the job was already complete




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BuildMaster.py	14 Jul 2005 19:12:04 -0000	1.16
+++ BuildMaster.py	18 Jul 2005 21:11:27 -0000	1.17
@@ -212,8 +212,16 @@
 
         for job in self._done_queue:
             curstage = job.get_cur_stage()
-            self._write_job_status_to_db(job.get_uid(), curstage)
-            print "%s (%s): Job finished." % (job.get_uid(), job.package)
+            uid = job.get_uid()
+            self._write_job_status_to_db(uid, curstage)
+
+            # If there are any status updates in the queue for this job, remove them
+            self._status_updates_lock.acquire()
+            if self._status_updates.has_key(uid):
+                del self._status_updates[uid]
+            self._status_updates_lock.release()
+
+            print "%s (%s): Job finished." % (uid, job.package)
             self._building_jobs_lock.acquire()
             self._building_jobs.remove(job)
             self._building_jobs_lock.release()


Index: Repo.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Repo.py	11 Jul 2005 20:13:37 -0000	1.10
+++ Repo.py	18 Jul 2005 21:11:27 -0000	1.11
@@ -85,9 +85,11 @@
             # Notify the build job that we've copied its files to the repo
             buildjob.repo_add_callback()
 
+        self._repo_additions = []
+
         (s, o) = commands.getstatusoutput('/usr/bin/createrepo -q -c %s -x "*.src.rpm" -x "*.debuginfo.rpm" %s' % (self._repo_cache_dir, self._repodir))
         if s != 0:
-            print "Error: createrepo failed with exit status %d!" % s
+            print "Error: createrepo failed with exit status %d!  Output: '%s'" % (s, o)
 
 
     def run(self):