Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 37124 | Differences between
and this patch

Collapse All | Expand All

(-)portage-2.1.1_pre20060710/bin/emerge (-1 / +16 lines)
Lines 2657-2664 Link Here
2657
			if ips:
2657
			if ips:
2658
				del ips[0]
2658
				del ips[0]
2659
			if ips==[]:
2659
			if ips==[]:
2660
				rsync_afi = socket.AF_UNSPEC
2661
				for opt in ("-4", "--ipv4"):
2662
					for section in (rsync_opts, settings["PORTAGE_RSYNC_EXTRA_OPTS"]):
2663
						if opt in section:
2664
							rsync_afi = socket.AF_INET
2665
				for opt in ("-6", "--ipv6"):
2666
					for section in (rsync_opts, settings["PORTAGE_RSYNC_EXTRA_OPTS"]):
2667
						if opt in section:
2668
							rsync_afi = socket.AF_INET6
2669
2660
				try:
2670
				try:
2661
					ips=socket.gethostbyname_ex(hostname)[2]
2671
					for addrinfo in socket.getaddrinfo(hostname, None, rsync_afi, socket.SOCK_STREAM):
2672
						if addrinfo[0] == 10:	# IPv6 addresses need to be enclosed in square brackets
2673
							ips.append('[' + addrinfo[4][0] + ']')
2674
						else:
2675
							ips.append(addrinfo[4][0])
2676
							
2662
				except SystemExit, e:
2677
				except SystemExit, e:
2663
					raise # Needed else can't exit
2678
					raise # Needed else can't exit
2664
				except Exception, e:
2679
				except Exception, e:

Return to bug 37124