From: Zac Medico Date: Fri, 9 Nov 2007 03:33:07 +0000 (-0000) Subject: Bug #198491 - Disable termios.OPOST post-processing of output on X-Git-Tag: v2.2_pre1~419 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1b5e84d45b1921359d8bc366c3da15cc5d82ab7a;p=portage.git 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. svn path=/main/trunk/; revision=8473 --- diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index f5ea0318a..40814d4b8 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2616,6 +2616,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