From 2280d3bf987f0b002b00d031f997fbc30ff85770 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 7 Oct 2010 10:11:08 -0700 Subject: Calculate maxretries before len(ips) changes. --- pym/_emerge/actions.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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)) -- cgit v1.2.3-1-g7c22