diff options
author | Steven Knight <knight@baldmt.com> | 2009-12-17 02:09:50 +0000 |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2009-12-17 02:09:50 +0000 |
commit | 07ce55a606f614c6de4c7065efc73d5337292dc0 (patch) | |
tree | 3b09d6dd0bb64b825badf764dd02392fbff80cc1 /bin/time-scons.py | |
parent | 0bf3d84a5097f2fa365c979a539ddcd707d9bc8e (diff) | |
download | scons-07ce55a606f614c6de4c7065efc73d5337292dc0.tar.gz |
Fix the time-scons.py --logfiles option.
Diffstat (limited to 'bin/time-scons.py')
-rw-r--r-- | bin/time-scons.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/time-scons.py b/bin/time-scons.py index 10684e09..90c69851 100644 --- a/bin/time-scons.py +++ b/bin/time-scons.py @@ -114,9 +114,11 @@ class CommandRunner: if stdout is sys.stdout: # Same as passing sys.stdout, except works with python2.4. subout = None - else: + elif stdout is None: # Open pipe for anything else so Popen works on python2.4. subout = subprocess.PIPE + else: + subout = stdout if stderr is sys.stderr: # Same as passing sys.stdout, except works with python2.4. suberr = None @@ -124,19 +126,12 @@ class CommandRunner: # Merge with stdout if stderr isn't specified. suberr = subprocess.STDOUT else: - # Open pipe for anything else so Popen works on python2.4. - suberr = subprocess.PIPE + suberr = stderr p = subprocess.Popen(command, shell=(sys.platform == 'win32'), stdout=subout, stderr=suberr) p.wait() - if stdout is None: - self.stdout = p.stdout.read() - elif stdout is not sys.stdout: - stdout.write(p.stdout.read()) - if stderr not in (None, sys.stderr): - stderr.write(p.stderr.read()) return p.returncode def run(self, command, display=None, stdout=None, stderr=None): |