| 1 |
commit: 12cc872ab3ae821874cd6f06bb9500061c538712 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 5 01:38:48 2013 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 5 01:38:48 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=12cc872a |
| 7 |
|
| 8 |
_add_dep: remove questionable need_restart logic |
| 9 |
|
| 10 |
This need_restart logic was apparently intended to interact with |
| 11 |
want_restart_for_use_change, but doesn't appear to be necessary |
| 12 |
anymore. We really don't want the need_restart flag to prevent |
| 13 |
"missing dependency" backtracking. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/_emerge/depgraph.py | 8 ++++++-- |
| 17 |
1 files changed, 6 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py |
| 20 |
index 9033285..34ad413 100644 |
| 21 |
--- a/pym/_emerge/depgraph.py |
| 22 |
+++ b/pym/_emerge/depgraph.py |
| 23 |
@@ -1695,9 +1695,13 @@ class depgraph(object): |
| 24 |
self._slot_operator_unsatisfied_probe(dep): |
| 25 |
self._slot_operator_unsatisfied_backtrack(dep) |
| 26 |
return 1 |
| 27 |
- elif not self.need_restart(): |
| 28 |
+ else: |
| 29 |
# Do not backtrack if only USE have to be changed in |
| 30 |
- # order to satisfy the dependency. |
| 31 |
+ # order to satisfy the dependency. Note that when |
| 32 |
+ # want_restart_for_use_change sets the need_restart |
| 33 |
+ # flag, it causes _select_pkg_highest_available to |
| 34 |
+ # return None, and eventually we come through here |
| 35 |
+ # and skip the "missing dependency" backtracking path. |
| 36 |
dep_pkg, existing_node = \ |
| 37 |
self._select_package(dep.root, dep.atom.without_use, |
| 38 |
onlydeps=dep.onlydeps) |
Archives