diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-16 17:36:36 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-18 12:47:11 -0700 |
| commit | 7b021591b59ef5a995fcdec79c0fbda790853a17 (patch) | |
| tree | 10a9121a47bfdfebb465ecf034b466c94796fbd4 /pym/_emerge | |
| parent | 56a0b8f58a51d1107e11267e39f53c7fd7becc90 (diff) | |
| download | portage-7b021591b59ef5a995fcdec79c0fbda790853a17.tar.gz portage-7b021591b59ef5a995fcdec79c0fbda790853a17.tar.bz2 portage-7b021591b59ef5a995fcdec79c0fbda790853a17.zip | |
Scheduler: terminate _merge_wait_queue
Diffstat (limited to 'pym/_emerge')
| -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 de635b2b3..b5b258d4a 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. |