[patch] Fix PORTAGE_RSYNC_RETRIES functionality

portage-2.1.11-rsync-retries-fix.patch (text/plain), 754 bytes, created by Gordon Malm (RETIRED) on 2014-01-09 01:02:26 UTC

--- /usr/lib/portage/pym/_emerge/actions.py
+++ /usr/lib/portage/pym/_emerge/actions.py
@@ -2186,6 +2186,7 @@
 
 		addrinfos = None
 		uris = []
+		uris_save = []
 
 		try:
 			addrinfos = getaddrinfo_validate(
@@ -2246,10 +2247,17 @@
 		while (1):
 			if uris:
 				dosyncuri = uris.pop()
+				uris_save.append(dosyncuri)
 			else:
-				writemsg("!!! Exhausted addresses for %s\n" % \
-					hostname, noiselevel=-1)
-				return 1
+				if maxretries < 0 or retries > maxretries:
+					writemsg("!!! Exhausted addresses for %s\n" % \
+						hostname, noiselevel=-1)
+					return 1
+				else:
+					uris_save.reverse()
+					uris = uris_save
+					dosyncuri = uris_save.pop()
+					uris_save = [dosyncuri]
 
 			if (retries==0):
 				if "--ask" in myopts: