diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 03:54:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 03:54:17 +0000 |
| commit | b2857e3458cfdcfc59e47fe25bd1698717e66f5a (patch) | |
| tree | 707c770170489bd260b71d838ce5d63a61d04a46 | |
| parent | bcd77f5ffcb45acacbaf0010e28f67bd9f7a19ce (diff) | |
| download | portage-b2857e3458cfdcfc59e47fe25bd1698717e66f5a.tar.gz portage-b2857e3458cfdcfc59e47fe25bd1698717e66f5a.tar.bz2 portage-b2857e3458cfdcfc59e47fe25bd1698717e66f5a.zip | |
Test for python openpty breakage after freebsd7 to freebsd8 upgrade, which
results in a 'Function not implemented' error and the process being killed.
Thanks to Javier Villavicenciom <the_paya@g.o> for reporting and helping to
develop this test.
svn path=/main/trunk/; revision=15512
| -rw-r--r-- | pym/portage/package/ebuild/_pty.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/_pty.py b/pym/portage/package/ebuild/_pty.py index 7cc1e4422..f67ca09c4 100644 --- a/pym/portage/package/ebuild/_pty.py +++ b/pym/portage/package/ebuild/_pty.py @@ -132,6 +132,8 @@ if not _can_test_pty_eof(): # Skip _test_pty_eof() on systems where it hangs. _tested_pty = True +_fbsd_test_pty = platform.system() == 'FreeBSD' + def _create_pty_or_pipe(copy_term_size=None): """ Try to create a pty and if then fails then create a normal @@ -148,7 +150,7 @@ def _create_pty_or_pipe(copy_term_size=None): got_pty = False - global _disable_openpty, _tested_pty + global _disable_openpty, _fbsd_test_pty, _tested_pty if not (_tested_pty or _disable_openpty): try: if not _test_pty_eof(): @@ -160,6 +162,19 @@ def _create_pty_or_pipe(copy_term_size=None): del e _tested_pty = True + if _fbsd_test_pty and not _disable_openpty: + # Test for python openpty breakage after freebsd7 to freebsd8 + # upgrade, which results in a 'Function not implemented' error + # and the process being killed. + pid = os.fork() + if pid == 0: + pty.openpty() + os._exit(os.EX_OK) + pid, status = os.waitpid(pid, 0) + if (status & 0xff) == 140: + _disable_openpty = True + _fbsd_test_pty = False + if _disable_openpty: master_fd, slave_fd = os.pipe() else: |