--- PackageJob.py	2006-10-31 12:57:36.000000000 -0500
+++ PackageJob.py.working	2006-11-05 21:38:24.000000000 -0500
@@ -510,7 +510,7 @@
                 threshold = 5
             if use_yum_logger == True:
                 # For yum 2.x and earlier
-                base.log = logger.Logger(threshold=threshold, file_object=sys.stdout)
+                base.log = Logger(threshold=threshold, file_object=sys.stdout)
             else:
                 # Use python logging module (yum 3.x and later)
                 base.doLoggingSetup(threshold, 1)
@@ -695,7 +695,7 @@
         self._die = True
 
         self.log(msg="Job kill request from %s" % username)
-        if self._curstage == 'waiting':
+        if self._curstage in ['waiting', 'depsolve']:
             # In 'waiting' stage, we have no controller thread.  So to get
             # the job killed immediately, we have to start one
             t = PackageJobController(self, 'killed', None)