From 813cb032c47b7b8507fba28a3629bec0d2b244cd Mon Sep 17 00:00:00 2001 From: alalazo Date: Tue, 12 Jul 2016 18:00:00 +0200 Subject: [PATCH] package.py : updated logic to log.py rework Conflicts: lib/spack/spack/package.py --- lib/spack/llnl/util/tty/log.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/spack/llnl/util/tty/log.py b/lib/spack/llnl/util/tty/log.py index 9b9278b73ce..cff7f22dcde 100644 --- a/lib/spack/llnl/util/tty/log.py +++ b/lib/spack/llnl/util/tty/log.py @@ -203,8 +203,13 @@ def __exit__(self, exc_type, exception, traceback): # 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