diff options
| author | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-12 18:00:00 +0200 |
|---|---|---|
| committer | alalazo <massimiliano.culpo@googlemail.com> | 2016-07-13 09:27:09 +0200 |
| commit | 813cb032c47b7b8507fba28a3629bec0d2b244cd (patch) | |
| tree | 17589069cfd03b5b67fc2bc61fcd3a1b724047fb | |
| parent | 513cdd580ea804c9861be07dd815b4f0745b8d4f (diff) | |
| download | spack-813cb032c47b7b8507fba28a3629bec0d2b244cd.tar.gz spack-813cb032c47b7b8507fba28a3629bec0d2b244cd.tar.bz2 spack-813cb032c47b7b8507fba28a3629bec0d2b244cd.tar.xz spack-813cb032c47b7b8507fba28a3629bec0d2b244cd.zip | |
package.py : updated logic to log.py rework
Conflicts:
lib/spack/spack/package.py
| -rw-r--r-- | lib/spack/llnl/util/tty/log.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 9b9278b73c..cff7f22dcd 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -203,8 +203,13 @@ class log_output(object): # Flush the log to disk. sys.stdout.flush() sys.stderr.flush() - os.dup2(self._stdout, sys.stdout.fileno()) - os.dup2(self._stderr, sys.stderr.fileno()) + if self.directAssignment: + # We seem to need this only to pass test/install.py + sys.stdout = self._stdout + sys.stderr = self._stderr + else: + os.dup2(self._stdout, sys.stdout.fileno()) + os.dup2(self._stderr, sys.stderr.fileno()) # restore output options. color._force_color = self._force_color |