From 34e329ae93e4cfb409d4de88ceabdbda863c2f91 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 10 Oct 2010 16:18:37 -0700 Subject: Ensure backtrack loop termination. --- pym/_emerge/depgraph.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 3ed81e445..054dc8ca0 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -5531,11 +5531,15 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp if success or mydepgraph.success_without_autounmask(): break + elif not allow_backtracking: + break elif backtracked > max_retries: break elif mydepgraph.need_restart(): backtracked += 1 - backtracker.feedback(mydepgraph.get_backtrack_infos()) + backtracker.feedback(mydepgraph.get_backtrack_infos()) + else: + break if not (success or mydepgraph.success_without_autounmask()) and backtracked: -- cgit v1.2.3-1-g7c22