diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-16 17:36:36 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-16 17:36:36 -0700 |
| commit | 282263a511d13b62e3c4d0636011f486b1eeb588 (patch) | |
| tree | 1b9ab0b92644e2e8393beaeaf280e89f5f95f058 /pym/_emerge/Scheduler.py | |
| parent | 906f42f51dcb10b390732b91409059400c5fb609 (diff) | |
| download | portage-282263a511d13b62e3c4d0636011f486b1eeb588.tar.gz portage-282263a511d13b62e3c4d0636011f486b1eeb588.tar.bz2 portage-282263a511d13b62e3c4d0636011f486b1eeb588.zip | |
Scheduler: terminate _merge_wait_queue
Diffstat (limited to 'pym/_emerge/Scheduler.py')
| -rw-r--r-- | pym/_emerge/Scheduler.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 6c2460455..b961e83c0 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -300,6 +300,10 @@ class Scheduler(PollScheduler): # them and their start/exit handlers won't be called. for build in self._task_queues.jobs._task_queue: self._running_tasks.remove(build.pkg) + if self._merge_wait_queue: + for merge in self._merge_wait_queue: + self._running_tasks.remove(merge.merge.pkg) + del self._merge_wait_queue[:] for merge in self._task_queues.merge._task_queue: # Setup phases may be scheduled in this queue, but # we're only interested in the PackageMerge instances. |