From 648190a1d6636ed2d847e0406f13114eac070d55 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 2 May 2008 21:10:37 +0000 Subject: 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) svn path=/main/branches/2.1.2/; revision=10107 --- bin/emerge | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 2eb370f02..22523818a 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3372,6 +3372,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] -- cgit v1.2.3-1-g7c22