commit: b9767a27b8af541a05de6a376493b6556649f24b
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 02:37:38 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Apr 20 19:39:00 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b9767a27
depgraph: fix _validate_blockers to revert state from previous calls
Since the _solve_non_slot_operator_slot_conflicts method can
remove packages from the graph, it's possible that some of the
state changes made by previous _validate_blockers calls are
no longer valid. Therefore, revert state when appropriate.
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/_emerge/depgraph.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 8a614c495..3232816d5 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -6901,6 +6901,12 @@ class depgraph(object):
self._dynamic_config._blocker_uninstalls = digraph()
self._dynamic_config.digraph.difference_update(previous_uninstall_tasks)
+ # Revert state from previous calls.
+ self._dynamic_config._blocker_parents.update(
+ self._dynamic_config._irrelevant_blockers)
+ self._dynamic_config._irrelevant_blockers.clear()
+ self._dynamic_config._unsolvable_blockers.clear()
+
for blocker in
self._dynamic_config._blocker_parents.leaf_nodes():
self._spinner_update()
root_config = self._frozen_config.roots[blocker.root]
