Apply @akidata's fix re #965 + changelog

fabric · Dec 15, 2013 · 9b58343 · 9b58343
1 parent 46ff4d8
commit 9b58343
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,9 @@
 Changelog
 =========
 
+* :bug:`965 major` Tweak IO flushing behavior when in linewise (& thus
+  parallel) mode so interwoven output is less frequent. Thanks to `@akidata`
+  for catch & patch.
 * :release:`1.8.0 <2013-09-20>`
 * :feature:`931` Allow overriding of `.abort` behavior via a custom
   exception-returning callable set as :ref:`env.abort_exception

diff --git a/fabric/io.py b/fabric/io.py
@@ -50,7 +50,11 @@ def __init__(self, chan, attr, stream, capture, timeout):
 
     def _flush(self, text):
         self.stream.write(text)
-        self.stream.flush()
+        # Actually only flush if not in linewise mode.
+        # When linewise is set (e.g. in parallel mode) flushing makes
+        # doubling-up of line prefixes, and other mixed output, more likely.
+        if not env.linewise:
+            self.stream.flush()
         self.write_buffer.extend(text)
 
     def loop(self):