[patch] Improved patch

emerge.diff (text/plain), 1.35 KB, created by Bernhard Schmidt on 2004-10-08 19:00:00 UTC

*** bin/emerge.old	Sat Oct  9 01:19:35 2004
--- bin/emerge	Sat Oct  9 03:57:17 2004
***************
*** 3,9 ****
  # Distributed under the terms of the GNU General Public License v2
  # $Header: /home/cvsroot/gentoo-src/portage/bin/emerge,v 1.264 2004/02/08 21:24:15 nakano Exp $
  
! import os,sys
  os.environ["PORTAGE_CALLER"]="emerge"
  sys.path = ["/usr/lib/portage/pym"]+sys.path
  
--- 3,9 ----
  # Distributed under the terms of the GNU General Public License v2
  # $Header: /home/cvsroot/gentoo-src/portage/bin/emerge,v 1.264 2004/02/08 21:24:15 nakano Exp $
  
! import os,sys,random
  os.environ["PORTAGE_CALLER"]="emerge"
  sys.path = ["/usr/lib/portage/pym"]+sys.path
  
***************
*** 2080,2086 ****
  				del ips[0]
  			if ips==[]:
  				try:
! 					ips=socket.gethostbyname_ex(hostname)[2]
  				except Exception, e:
  					print "Notice:",str(e)
  					dosyncuri=syncuri
--- 2080,2094 ----
  				del ips[0]
  			if ips==[]:
  				try:
! 					ip6sockets = socket.getaddrinfo(hostname,None,10,socket.SOCK_STREAM)
! 					random.shuffle(ip6sockets)
! 					for addrinfo in ip6sockets:
! 						ips.append('[' + addrinfo[4][0] + ']')
! 				except Exception, e:
! 					print "No IPv6 record found, trying IPv4:",str(e)
! 
! 				try:
! 					ips.extend(socket.gethostbyname_ex(hostname)[2])
  				except Exception, e:
  					print "Notice:",str(e)
  					dosyncuri=syncuri