x/turbo-hipster
Code Issues Proposed changes

fix line read-ins for stdin

Browse Source
This commit is contained in:
Joshua Hesketh
2013-07-29 09:05:58 +10:00
parent c1f7b4a4df
commit 09b2f7f474
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
turbo_hipster/lib/utils.py
View File

@@ -108,7 +108,8 @@ def execute_to_log(cmd, logfile, timeout=-1,
descriptors[p.stdout.fileno()] = dict( descriptors[p.stdout.fileno()] = dict(
name='[output]', name='[output]',
poll=(select.POLLIN | select.POLLHUP) poll=(select.POLLIN | select.POLLHUP),
lines=''
) )
poll_obj = select.poll() poll_obj = select.poll()
@@ -121,7 +122,7 @@ def execute_to_log(cmd, logfile, timeout=-1,
""" Write the fd to log """ """ Write the fd to log """
descriptors[fd]['lines'] += os.read(fd, 1024 * 1024) descriptors[fd]['lines'] += os.read(fd, 1024 * 1024)
# Avoid partial lines by only processing input with breaks # Avoid partial lines by only processing input with breaks
if lines[fd].find('\n') != -1: if descriptors[fd]['lines'].find('\n') != -1:
elems = descriptors[fd]['lines'].split('\n') elems = descriptors[fd]['lines'].split('\n')
# Take all but the partial line # Take all but the partial line
for l in elems[:-1]: for l in elems[:-1]: