diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-12 10:35:23 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-12 10:35:23 -0800 |
| commit | df2638070b38577d23947c40595af058e7b75abd (patch) | |
| tree | 764a686edf22e1c1bbfcdb88747dd4f63efdba8e /pym | |
| parent | 83e677766650e73071813c0d46547647e5f66029 (diff) | |
| download | portage-df2638070b38577d23947c40595af058e7b75abd.tar.gz portage-df2638070b38577d23947c40595af058e7b75abd.tar.bz2 portage-df2638070b38577d23947c40595af058e7b75abd.zip | |
Scheduler: fix AttributeError in _terminate_tasks
Thanks to David James <davidjames@google.com> for reporting this error:
AttributeError: 'EbuildPhase' object has no attribute 'merge'
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/Scheduler.py | 5 |
1 files changed, 4 insertions, 1 deletions
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() |