diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2013-03-04 17:38:48 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-03-04 17:38:48 -0800 |
| commit | 12cc872ab3ae821874cd6f06bb9500061c538712 (patch) | |
| tree | bed934631b372fa49451e6ee44499b391d2c0654 | |
| parent | Use endswith(tuple). (diff) | |
| download | portage-12cc872ab3ae821874cd6f06bb9500061c538712.tar.gz portage-12cc872ab3ae821874cd6f06bb9500061c538712.tar.bz2 portage-12cc872ab3ae821874cd6f06bb9500061c538712.zip | |
_add_dep: remove questionable need_restart logicv2.2.0_alpha166
This need_restart logic was apparently intended to interact with
want_restart_for_use_change, but doesn't appear to be necessary
anymore. We really don't want the need_restart flag to prevent
"missing dependency" backtracking.
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 90332851a..34ad41353 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -1695,9 +1695,13 @@ class depgraph(object): self._slot_operator_unsatisfied_probe(dep): self._slot_operator_unsatisfied_backtrack(dep) return 1 - elif not self.need_restart(): + else: # Do not backtrack if only USE have to be changed in - # order to satisfy the dependency. + # order to satisfy the dependency. Note that when + # want_restart_for_use_change sets the need_restart + # flag, it causes _select_pkg_highest_available to + # return None, and eventually we come through here + # and skip the "missing dependency" backtracking path. dep_pkg, existing_node = \ self._select_package(dep.root, dep.atom.without_use, onlydeps=dep.onlydeps) |