From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 17 Mar 2011 00:36:36 +0000 (-0700)
Subject: Scheduler: terminate _merge_wait_queue
X-Git-Tag: v2.2.0_alpha28~15
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=282263a511d13b62e3c4d0636011f486b1eeb588;p=portage.git

Scheduler: terminate _merge_wait_queue
---

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.