diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2017-04-18 19:37:38 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2017-04-20 12:39:00 -0700 |
| commit | b9767a27b8af541a05de6a376493b6556649f24b (patch) | |
| tree | 6ff3377d3313d87b881b276975f0e0410c658dc4 | |
| parent | digraph: add update and clear methods (diff) | |
| download | portage-b9767a27b8af541a05de6a376493b6556649f24b.tar.gz portage-b9767a27b8af541a05de6a376493b6556649f24b.tar.bz2 portage-b9767a27b8af541a05de6a376493b6556649f24b.zip | |
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@gentoo.org>
| -rw-r--r-- | pym/_emerge/depgraph.py | 6 |
1 files changed, 6 insertions, 0 deletions
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] |