extras-buildsys/server PackageJob.py,1.54,1.55

[Daniel Williams (dcbw)]

Author: dcbw

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

Modified Files:
	PackageJob.py 
Log Message:
2006-10-31  Dan Williams  <dcbw at redhat.com>

	Patches by Joe Todaro <jstodaro at us.ibm.com>
	* server/PackageJob.py
		- (_kill_all_archjobs): don't traceback when killing jobs in depsolve_wait,
			where the archjob key is filled in, but the archjob itself hasn't
			been created yet because it's not yet building




Index: PackageJob.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- PackageJob.py	22 Jul 2006 15:07:12 -0000	1.54
+++ PackageJob.py	31 Oct 2006 16:46:21 -0000	1.55
@@ -707,7 +707,10 @@
     def _kill_all_archjobs(self, user_requested=False):
         self._archjobs_lock.acquire()
         for job in self._archjobs.values():
-            job.die(user_requested)
+            # During depsolve, self._archjobs will be populated with keys,
+            # but the values will be None since the archjobs aren't building yet.
+            if job != None:
+                job.die(user_requested)
         self._archjobs_lock.release()
 
     def wake(self):