summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPeter Scheibel <scheibel1@llnl.gov>2015-11-25 12:28:43 -0800
committerPeter Scheibel <scheibel1@llnl.gov>2015-11-25 12:28:43 -0800
commit60f7756626271b46ee7d32a80ba1e78b337d6f91 (patch)
tree31607f0f13647ebef046ede711755aed0871a346 /lib
parent18dea24df8710bb65fd61278fb6bdf45d28d2aa6 (diff)
downloadspack-60f7756626271b46ee7d32a80ba1e78b337d6f91.tar.gz
spack-60f7756626271b46ee7d32a80ba1e78b337d6f91.tar.bz2
spack-60f7756626271b46ee7d32a80ba1e78b337d6f91.tar.xz
spack-60f7756626271b46ee7d32a80ba1e78b337d6f91.zip
Executable.__call__ original semantics were to avoid redirecting process output
to the output stream if return_output was set. This branch undid that and this commit restores those semantics.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/util/executable.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/spack/spack/util/executable.py b/lib/spack/spack/util/executable.py
index 6848a7e2a5..6088d4514e 100644
--- a/lib/spack/spack/util/executable.py
+++ b/lib/spack/spack/util/executable.py
@@ -100,7 +100,8 @@ class Executable(object):
out, err = proc.communicate()
self.returncode = proc.returncode
- output.write(out)
+ if not return_output:
+ output.write(out)
error.write(err)
rc = proc.returncode