From: Zac Medico Date: Sat, 12 Mar 2011 18:35:23 +0000 (-0800) Subject: Scheduler: fix AttributeError in _terminate_tasks X-Git-Tag: v2.2.0_alpha27~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df2638070b38577d23947c40595af058e7b75abd;p=portage.git Scheduler: fix AttributeError in _terminate_tasks Thanks to David James for reporting this error: AttributeError: 'EbuildPhase' object has no attribute 'merge' --- diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index c6161201a..6c2460455 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -301,7 +301,10 @@ class Scheduler(PollScheduler): for build in self._task_queues.jobs._task_queue: self._running_tasks.remove(build.pkg) for merge in self._task_queues.merge._task_queue: - self._running_tasks.remove(merge.merge.pkg) + # Setup phases may be scheduled in this queue, but + # we're only interested in the PackageMerge instances. + if isinstance(merge, PackageMerge): + self._running_tasks.remove(merge.merge.pkg) for q in self._task_queues.values(): q.clear()