From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 10 Oct 2010 23:02:03 +0000 (-0700)
Subject: Tweak --backtrack debug message.
X-Git-Tag: v2.2_rc92~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b5f6a8ae01df2193124e9f6850e678df463aaa4;p=portage.git

Tweak --backtrack debug message.

The message should now be consistent with older portage.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index edc920d46..3ed81e445 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -5515,14 +5515,12 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
 	max_depth = myopts.get('--backtrack', 5)
 	allow_backtracking = max_retries > 0
 	backtracker = Backtracker(max_depth)
-	backtracked = False
-	tries = 0
+	backtracked = 0
 
 	frozen_config = _frozen_depgraph_config(settings, trees,
 		myopts, spinner)
 
 	while backtracker:
-		tries += 1
 		backtrack_parameters = backtracker.get()
 
 		mydepgraph = depgraph(settings, trees, myopts, myparams, spinner,
@@ -5533,10 +5531,10 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
 
 		if success or mydepgraph.success_without_autounmask():
 			break
-		elif tries > max_retries:
+		elif backtracked > max_retries:
 			break
 		elif mydepgraph.need_restart():
-			backtracked = True
+			backtracked += 1
 			backtracker.feedback(mydepgraph.get_backtrack_infos())	
 
 	if not (success or mydepgraph.success_without_autounmask()) and backtracked:
@@ -5544,7 +5542,7 @@ def _backtrack_depgraph(settings, trees, myopts, myparams, myaction, myfiles, sp
 		if "--debug" in myopts:
 			writemsg_level(
 				"\n\nbacktracking aborted after %s tries\n\n" % \
-				tries, noiselevel=-1, level=logging.DEBUG)
+				backtracked, noiselevel=-1, level=logging.DEBUG)
 
 		mydepgraph = depgraph(settings, trees, myopts, myparams, spinner,
 			frozen_config=frozen_config,