extras-buildsys/builder builder.py,1.33,1.34

[Daniel Williams (dcbw)]

Author: dcbw

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

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

    * More misc cleanups




Index: builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- builder.py	29 Aug 2005 17:48:13 -0000	1.33
+++ builder.py	29 Aug 2005 19:28:40 -0000	1.34
@@ -504,14 +504,6 @@
                 'sparc64':  Sparc64Arch
                }
 
-def check_job_type(obj):
-    """ Verify that an object is of the same type as one of our builder objects """
-    for item in builder_dict.values():
-        if type(obj) == type(item):
-            return True
-    return False
-
-
 class XMLRPCBuilderServer:
     def __init__(self, cfg, max_jobs):
         self._all_jobs = {} # unique id => awclass instance
@@ -524,12 +516,6 @@
         if self._cfg.get_bool("General", "debug"):
             print string
 
-    def notify_job_done(self, job):
-        self._building_jobs_lock.acquire()
-        if job in self._building_jobs:
-            self._building_jobs.remove(job)
-        self._building_jobs_lock.release()
-
     def _generate_uniqid(self, target_str, srpm_url):
         sum = sha.new()
         sum.update('%d %s %s' % (time.time(), target_str, srpm_url))
@@ -606,15 +592,10 @@
         return uniqid
 
     def notify_job_done(self, archjob):
-        if check_job_type(archjob):
-            self._building_jobs_lock.acquire()
-            if archjob in self._building_jobs:
-                self._building_jobs.remove(archjob)
-            else:
-                print "Job not in building list!"
-            self._building_jobs_lock.release()
-        else:
-            print "bad job type!"
+        self._building_jobs_lock.acquire()
+        if archjob in self._building_jobs:
+            self._building_jobs.remove(archjob)
+        self._building_jobs_lock.release()
 
     def die(self, uniqid):
         try: