| 1 |
commit: bb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 1 00:24:43 2019 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 1 00:30:04 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb0bb410 |
| 7 |
|
| 8 |
_backtrack_depgraph: fix premature backtracking termination (bug 693242) |
| 9 |
|
| 10 |
Make backtracking continue as long as the backtracker has remaining |
| 11 |
nodes to explore. This fixes a case where it would terminate prematurely |
| 12 |
when the depgraph.need_restart() method returned False, even though the |
| 13 |
backtracker had remaining nodes to explore. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/693242 |
| 16 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 17 |
|
| 18 |
lib/_emerge/depgraph.py | 4 ++-- |
| 19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
| 22 |
index 3e99ac077..08240af67 100644 |
| 23 |
--- a/lib/_emerge/depgraph.py |
| 24 |
+++ b/lib/_emerge/depgraph.py |
| 25 |
@@ -9794,8 +9794,8 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp |
| 26 |
elif mydepgraph.need_restart(): |
| 27 |
backtracked += 1 |
| 28 |
backtracker.feedback(mydepgraph.get_backtrack_infos()) |
| 29 |
- else: |
| 30 |
- break |
| 31 |
+ elif backtracker: |
| 32 |
+ backtracked += 1 |
| 33 |
|
| 34 |
if not (success or mydepgraph.need_config_change()) and backtracked: |
Archives