summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-07 08:22:47 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-07 08:26:36 -0700
commitad6fe50e557ad18aa9369fcb5bedb290539efe30 (patch)
tree2e95323912a1f9012509cbd45182a9e96f73de0f
parent0a7735a5feedf765b429f78e0cc0e6a1287a8f62 (diff)
downloadportage-ad6fe50e557ad18aa9369fcb5bedb290539efe30.tar.gz
portage-ad6fe50e557ad18aa9369fcb5bedb290539efe30.tar.bz2
portage-ad6fe50e557ad18aa9369fcb5bedb290539efe30.zip
Report len(ips) as max retry count for --sync.
-rw-r--r--pym/_emerge/actions.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 322e4d497..1866cf9c0 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2141,10 +2141,15 @@ 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,maxretries,dosyncuri))
- print("\n\n>>> Starting retry %d of %d with %s" % (retries,maxretries,dosyncuri))
+ (retries, effective_maxretries, dosyncuri))
+ writemsg_stdout(
+ "\n\n>>> Starting retry %d of %d with %s\n" % \
+ (retries, effective_maxretries, dosyncuri), noiselevel=-1)
if mytimestamp != 0 and "--quiet" not in myopts:
print(">>> Checking server timestamp ...")