From 3f07d0d007a7c00362261495724f599a8f5991e8 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Nov 2007 20:05:12 +0000 Subject: Bug #198491 - Disable termios.OPOST post-processing of output on the slave pty file descriptor since otherwise weird things like \n -> \r\n transformations may occur. Thanks to Ulrich Mueller for this patch. (trunk r8473) svn path=/main/branches/2.1.2/; revision=8550 --- pym/portage.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index 254ae0b1a..e25c85678 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2567,6 +2567,13 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero writemsg("openpty failed: '%s'\n" % str(e), noiselevel=1) del e master_fd, slave_fd = os.pipe() + if got_pty: + # Disable post-processing of output since otherwise weird + # things like \n -> \r\n transformations may occur. + import termios + mode = termios.tcgetattr(slave_fd) + mode[1] &= ~termios.OPOST + termios.tcsetattr(slave_fd, termios.TCSANOW, mode) # We must set non-blocking mode before we close the slave_fd # since otherwise the fcntl call can fail on FreeBSD (the child -- cgit v1.2.3-1-g7c22