From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 May 2008 21:09:20 +0000 (-0000)
Subject: In depgraph.validate_blockers(), discard any "uninstall" tasks scheduled
X-Git-Tag: v2.2_pre6~44
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=30517c78579612dc169937abe375aed5bab74a28;p=portage.git

In depgraph.validate_blockers(), discard any "uninstall" tasks scheduled
by previous calls, since those tasks may not make sense given the current
graph state.

svn path=/main/trunk/; revision=10106
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index b306f1085..0160f6d02 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3225,6 +3225,14 @@ class depgraph(object):
 				blocker_cache.flush()
 				del blocker_cache
 
+		# Discard any "uninstall" tasks scheduled by previous calls
+		# to this method, since those tasks may not make sense given
+		# the current graph state.
+		previous_uninstall_tasks = self._blocker_uninstalls.leaf_nodes()
+		if previous_uninstall_tasks:
+			self._blocker_uninstalls = digraph()
+			self.digraph.difference_update(previous_uninstall_tasks)
+
 		for blocker in self._blocker_parents.leaf_nodes():
 			self.spinner.update()
 			root_config = self.roots[blocker.root]