From: Zac Medico Date: Thu, 7 Oct 2010 15:22:47 +0000 (-0700) Subject: Report len(ips) as max retry count for --sync. X-Git-Tag: v2.1.9.14~8 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad6fe50e557ad18aa9369fcb5bedb290539efe30;p=portage.git Report len(ips) as max retry count for --sync. --- 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 ...")