From 282263a511d13b62e3c4d0636011f486b1eeb588 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 16 Mar 2011 17:36:36 -0700 Subject: Scheduler: terminate _merge_wait_queue --- pym/_emerge/Scheduler.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pym/_emerge') 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. -- cgit v1.2.3-1-g7c22