From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 7 Oct 2010 17:11:08 +0000 (-0700)
Subject: Calculate maxretries before len(ips) changes.
X-Git-Tag: v2.1.9.14~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2280d3bf987f0b002b00d031f997fbc30ff85770;p=portage.git

Calculate maxretries before len(ips) changes.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index c768edd13..2f0c0756a 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2117,6 +2117,10 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 		# reverse, for use with pop()
 		ips.reverse()
 
+		effective_maxretries = maxretries
+		if effective_maxretries < 0:
+			effective_maxretries = len(ips)
+
 		SERVER_OUT_OF_DATE = -1
 		EXCEEDED_MAX_RETRIES = -2
 		while (1):
@@ -2142,9 +2146,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 				if "--quiet" not in myopts:
 					print(">>> Starting rsync with "+dosyncuri+"...")
 			else:
-				effective_maxretries = maxretries
-				if effective_maxretries < 0:
-					effective_maxretries = len(ips)
 				emergelog(xterm_titles,
 					">>> Starting retry %d of %d with %s" % \
 						(retries, effective_maxretries, dosyncuri))