Scheduler: terminate _merge_wait_queue

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 6c2460455b7784ae445ce55b546535af011e6cef..b961e83c0e98d7e1321c483e0042c046f99a31e5 100644 (file)
--- 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.