In portage.spawn() logging, put the read end of the pipe in O_NONBLOCK mode just...

svn path=/main/trunk/; revision=7548

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index c5f05e0fba7e0ea547636ae411e26969e9027ba3..4d9f05e56a6c5c28d4da1f1b81b0ac9a8a111e4d 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -2465,32 +2465,28 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, fakero
                        fd_flags[f] = fcntl.fcntl(f.fileno(), fcntl.F_GETFL)
                buffsize = 65536
                eof = False
+               # Use non-blocking mode to prevent read
+               # calls from blocking indefinitely.
+               try:
+                       fcntl.fcntl(master_file.fileno(), fcntl.F_SETFL,
+                               fd_flags[master_file] | os.O_NONBLOCK)
+               except EnvironmentError, e:
+                       if e.errno != errno.EAGAIN:
+                               raise
+                       del e
+                       # The EAGAIN error signals eof on FreeBSD.
+                       eof = True
                while not eof:
                        events = select.select(iwtd, owtd, ewtd)
                        for f in events[0]:
-                               # Use non-blocking mode to prevent read
-                               # calls from blocking indefinitely.
-                               try:
-                                       fcntl.fcntl(f.fileno(), fcntl.F_SETFL,
-                                               fd_flags[f] | os.O_NONBLOCK)
-                               except EnvironmentError, e:
-                                       if e.errno != errno.EAGAIN:
-                                               raise
-                                       del e
-                                       # The EAGAIN error signals eof on FreeBSD.
-                                       eof = True
-                                       break
                                buf = array.array('B')
                                try:
                                        buf.fromfile(f, buffsize)
                                except EOFError:
                                        pass
-                               fcntl.fcntl(f.fileno(), fcntl.F_SETFL, fd_flags[f])
                                if not buf:
                                        eof = True
                                        break
-                               # Use blocking mode for writes since we'd rather block than
-                               # trigger a EWOULDBLOCK error.
                                if f is master_file:
                                        buf.tofile(stdout_file)
                                        stdout_file.flush()