From: Zac Medico Date: Wed, 28 Mar 2007 22:40:05 +0000 (-0000) Subject: For bug #172571, use socket.AF_INET as the default family for socket.getaddrinfo(). X-Git-Tag: v2.2_pre1~1521 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=915559c091f1d8db0404da09d39c07e16ab0eec9;p=portage.git For bug #172571, use socket.AF_INET as the default family for socket.getaddrinfo(). svn path=/main/trunk/; revision=6321 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index d41d9af0b..e872f5443 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -4034,7 +4034,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): all_rsync_opts = set(rsync_opts) all_rsync_opts.update( settings.get("PORTAGE_RSYNC_EXTRA_OPTS","").split()) - family = socket.AF_UNSPEC + family = socket.AF_INET if "-4" in all_rsync_opts or "--ipv4" in all_rsync_opts: family = socket.AF_INET elif socket.has_ipv6 and \