From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 4 Oct 2010 22:11:11 +0000 (-0700)
Subject: Add back --sync IPv4/IPv6 override support.
X-Git-Tag: v2.2_rc90~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa786192657f366d44ee7367e9ad69352a833048;p=portage.git

Add back --sync IPv4/IPv6 override support.
---

diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 476e21372..8ec2a4970 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2084,12 +2084,19 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 			settings.get("PORTAGE_RSYNC_EXTRA_OPTS",""))
 		all_rsync_opts.update(extra_rsync_opts)
 
+		family = socket.AF_UNSPEC
+		if "-4" in all_rsync_opts or "--ipv4" in all_rsync_opts:
+			family = socket.AF_INET
+		elif socket.has_ipv6 and \
+			("-6" in all_rsync_opts or "--ipv6" in all_rsync_opts):
+			family = socket.AF_INET6
+
 		ips_v4 = []
 		ips_v6 = []
 
 		try:
 			addrinfos = socket.getaddrinfo(hostname, None,
-				socket.AF_UNSPEC, socket.SOCK_STREAM)
+				family, socket.SOCK_STREAM)
 		except socket.error as e:
 			writemsg("!!! getaddrinfo failed: %s\n" % (e,), noiselevel=-1)
 			return 1