[gentoo-commits] portage r10107 - main/branches/2.1.2/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-05-02 21:10:37 +0000 (Fri, 02 May 2008)
New Revision: 10107

Modified:
   main/branches/2.1.2/bin/emerge
Log:
In depgraph.validate_blockers(), discard any "uninstall" tasks scheduled
by previous calls, since those tasks may not make sense given the current
graph state. (trunk r10106)


Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge	2008-05-02 21:09:20 UTC (rev 10106)
+++ main/branches/2.1.2/bin/emerge	2008-05-02 21:10:37 UTC (rev 10107)
@@ -3372,6 +3372,14 @@
 				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]

-- 
gentoo-commits@l.g.o mailing list