diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-10-04 15:11:11 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-10-04 15:11:11 -0700 |
| commit | aa786192657f366d44ee7367e9ad69352a833048 (patch) | |
| tree | d6cba3da605fa87db24893b66fe325150ee10571 | |
| parent | 8e954af12f7811f8602df727c112113965fe0121 (diff) | |
| download | portage-aa786192657f366d44ee7367e9ad69352a833048.tar.gz portage-aa786192657f366d44ee7367e9ad69352a833048.tar.bz2 portage-aa786192657f366d44ee7367e9ad69352a833048.zip | |
Add back --sync IPv4/IPv6 override support.
| -rw-r--r-- | pym/_emerge/actions.py | 9 |
1 files changed, 8 insertions, 1 deletions
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 |