grid: avoid spurious empty lines in Popen() stdout/log

8ed9c785 · Marco Mariani · 4929673f · 8ed9c785
Commit 8ed9c785 authored Jul 02, 2013 by Marco Mariani
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

slapos/grid/utils.py slapos/grid/utils.py +3 -2

No files found.
--- a/slapos/grid/utils.py
+++ b/slapos/grid/utils.py
@@ -109,8 +109,9 @@ class SlapPopen(subprocess.Popen):
      line = self.stdout.readline()
      if line == '' and self.poll() is not None:
        break
-      output_lines.append(line)
+      if line:
-      logger.info(line.rstrip('\n'))
+        output_lines.append(line)
+        logger.info(line.rstrip('\n'))
    self.output = ''.join(output_lines)