From aa786192657f366d44ee7367e9ad69352a833048 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 4 Oct 2010 15:11:11 -0700 Subject: Add back --sync IPv4/IPv6 override support. --- pym/_emerge/actions.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'pym') 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 -- cgit v1.2.3-1-g7c22