From: Fabian Groffen Date: Sat, 26 Sep 2009 20:48:32 +0000 (-0000) Subject: recently added _test_pty_eof does something which makes Darwin hang, so disable openp... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=5abffee0cea86555dfe8bce538bd3f12c3469022;p=portage.git recently added _test_pty_eof does something which makes Darwin hang, so disable openpty now (which used to work fine) svn path=/main/branches/prefix/; revision=14441 --- diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 7cbb8b998..a83eb5f0c 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3811,10 +3811,14 @@ def _test_pty_eof(): # 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"]: +if platform.system() in ["SunOS", "Darwin"]: # 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 + # introduction of _test_pty_eof Portage hangs (on the + # slave_file.close()) indicating some other problems with openpty on + # Darwin there _disable_openpty = True else: _disable_openpty = False