From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 17 Jan 2011 21:15:51 +0000 (-0800)
Subject: Scheduler: remove uninstall task from pkg_queue
X-Git-Tag: v2.2.0_alpha16
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea011a728a6d928e74561e7697e65805ef7b1282;p=portage.git

Scheduler: remove uninstall task from pkg_queue
---

diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 463d0d85e..39e8e6eef 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1447,6 +1447,10 @@ class Scheduler(PollScheduler):
 			# task complete (if any).
 			if self._digraph is not None and \
 				pkg_to_replace in self._digraph:
+				try:
+					self._pkg_queue.remove(pkg_to_replace)
+				except ValueError:
+					pass
 				self._task_complete(pkg_to_replace)
 			else:
 				self._pkg_cache.pop(pkg_to_replace, None)