From d916da77dfc94eb30c6f512f9d7d727a8f28600c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 5 Jan 2013 07:43:20 -0800 Subject: Handle os.write() return code with loop. --- pym/portage/dbapi/vartree.py | 4 +++- pym/portage/util/_async/PipeLogger.py | 10 ++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index beff5bdc6..ba149b745 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -3463,7 +3463,9 @@ class dblink(object): str_buffer.append(' '.join(fields)) str_buffer.append('\n') if str_buffer: - os.write(self._pipe, _unicode_encode(''.join(str_buffer))) + str_buffer = _unicode_encode(''.join(str_buffer)) + while str_buffer: + str_buffer = str_buffer[os.write(self._pipe, str_buffer):] def _emerge_log(self, msg): emergelog(False, msg) diff --git a/pym/portage/util/_async/PipeLogger.py b/pym/portage/util/_async/PipeLogger.py index 376ebfef7..5464879ff 100644 --- a/pym/portage/util/_async/PipeLogger.py +++ b/pym/portage/util/_async/PipeLogger.py @@ -86,14 +86,12 @@ class PipeLogger(AbstractPollTask): else: if not background and stdout_fd is not None: - write_successful = False failures = 0 - while True: + stdout_buf = buf + while stdout_buf: try: - if not write_successful: - os.write(stdout_fd, buf) - write_successful = True - break + stdout_buf = \ + stdout_buf[os.write(stdout_fd, stdout_buf):] except OSError as e: if e.errno != errno.EAGAIN: raise -- cgit v1.2.3-1-g7c22