aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2019-08-31 17:24:43 -0700
committerZac Medico <zmedico@gentoo.org>2019-08-31 17:30:04 -0700
commitbb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d (patch)
tree8dba4ff2a4c242f5310dba79eddd241ab18c3b82 /lib/_emerge/depgraph.py
parentUpdates for portage-2.3.74 release (diff)
downloadportage-bb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d.tar.gz
portage-bb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d.tar.bz2
portage-bb0bb4104b0d6cab16abce9cd6e1683c0b6d5c8d.zip
_backtrack_depgraph: fix premature backtracking termination (bug 693242)
Make backtracking continue as long as the backtracker has remaining nodes to explore. This fixes a case where it would terminate prematurely when the depgraph.need_restart() method returned False, even though the backtracker had remaining nodes to explore. Bug: https://bugs.gentoo.org/693242 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge/depgraph.py')
-rw-r--r--lib/_emerge/depgraph.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 3e99ac077..08240af67 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -9794,8 +9794,8 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
elif mydepgraph.need_restart():
backtracked += 1
backtracker.feedback(mydepgraph.get_backtrack_infos())
- else:
- break
+ elif backtracker:
+ backtracked += 1
if not (success or mydepgraph.need_config_change()) and backtracked: