From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 10 Oct 2010 23:18:37 +0000 (-0700)
Subject: Ensure backtrack loop termination.
X-Git-Tag: v2.2_rc92~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=34e329ae93e4cfb409d4de88ceabdbda863c2f91;p=portage.git

Ensure backtrack loop termination.
---

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: