[gentoo-commits] portage r14514 - main/branches/prefix/pym/portage

[Fabian Groffen (grobian)]

Author: grobian
Date: 2009-10-07 19:19:22 +0000 (Wed, 07 Oct 2009)
New Revision: 14514

Modified:
   main/branches/prefix/pym/portage/__init__.py
Log:
haubi reported that openpty no longer works on AIX either, so let's finish this and don't do openpty on non-Linux any more.  Will port this to trunk.

Modified: main/branches/prefix/pym/portage/__init__.py
===================================================================
--- main/branches/prefix/pym/portage/__init__.py	2009-10-07 19:14:00 UTC (rev 14513)
+++ main/branches/prefix/pym/portage/__init__.py	2009-10-07 19:19:22 UTC (rev 14514)
@@ -3868,14 +3868,18 @@
 
 # In some cases, openpty can be slow when it fails. Therefore,
 # stop trying to use it after the first failure.
-if platform.system() in ["SunOS", "Darwin"]:
-	# disable the use of openpty on Solaris as it seems Python's openpty
+if platform.system() not in ["Linux"]:
+	# Disable the use of openpty on Solaris as it seems Python's openpty
 	# implementation doesn't play nice on Solaris with Portage's
 	# behaviour causing hangs/deadlocks.
-	# disable on Darwin also, it used to work fine, but since the
+	# Disable on Darwin also, it used to work fine, but since the
 	# introduction of _test_pty_eof Portage hangs (on the
 	# slave_file.close()) indicating some other problems with openpty on
 	# Darwin there
+	# On AIX, haubi reported that the openpty code doesn't work any
+	# longer since the introduction of _test_pty_eof either.
+	# Looks like Python's openpty module is too fragile to use on UNIX,
+	# so only use it on Linux
 	_disable_openpty = True
 else:
 	_disable_openpty = False