From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Oct 2010 03:44:30 +0000 (-0700)
Subject: Ensure getaddrinfo fallback works when necessary.
X-Git-Tag: v2.1.9.18
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=56adeb8963f2ed629d0e1dbd85f7e9695fd772d4;p=portage.git

Ensure getaddrinfo fallback works when necessary.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 0ac7e3de5..708ff0ff5 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2099,11 +2099,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 				"!!! getaddrinfo failed for '%s': %s\n" % (hostname, e),
 				noiselevel=-1, level=logging.ERROR)
 
-		if not addrinfos:
-			# With some configurations we need to use the plain hostname
-			# rather than try to resolve the ip addresses (bug #340817).
-			uris.append(syncuri)
-		else:
+		if addrinfos:
 
 			AF_INET = socket.AF_INET
 			AF_INET6 = None
@@ -2136,6 +2132,11 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 					"//" + user_name + hostname + port + "/",
 					"//" + user_name + ip + port + "/", 1))
 
+		if not uris:
+			# With some configurations we need to use the plain hostname
+			# rather than try to resolve the ip addresses (bug #340817).
+			uris.append(syncuri)
+
 		# reverse, for use with pop()
 		uris.reverse()