Flush sys.stdout after every write() so it intermixes properly with sys.stderr when redirected.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 5d87b05..842e7ee 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -639,6 +639,17 @@ def _main():
 	else:
 	    raise UserError, "No SConstruct file found."
 
+    class Unbuffered:
+        def __init__(self, file):
+            self.file = file
+        def write(self, arg):
+            self.file.write(arg)
+            self.file.flush()
+        def __getattr__(self, attr):
+            return getattr(self.file, attr)
+
+    sys.stdout = Unbuffered(sys.stdout)
+
     sys.path = include_dirs + sys.path
 
     for script in scripts: