From e62744741785075c535c739b2b0613ebbe4aa0b6 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Thu, 15 Jun 2017 04:27:18 -0500 Subject: Prefer vim to vi for default editor (#4230) * vim > vi * Allow which to accept multiple args * Update __init__ to use which with multiple args * Fix doc tests --- var/spack/repos/builtin/packages/hdf5-blosc/package.py | 2 +- var/spack/repos/builtin/packages/hdf5/package.py | 2 +- var/spack/repos/builtin/packages/spark/package.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/hdf5-blosc/package.py b/var/spack/repos/builtin/packages/hdf5-blosc/package.py index 053a4d4852..288f958134 100644 --- a/var/spack/repos/builtin/packages/hdf5-blosc/package.py +++ b/var/spack/repos/builtin/packages/hdf5-blosc/package.py @@ -184,7 +184,7 @@ Done. "-L%s" % spec["hdf5"].prefix.lib, "-lhdf5") try: check = Executable("./check") - output = check(return_output=True) + output = check(output=str) except: output = "" success = output == expected diff --git a/var/spack/repos/builtin/packages/hdf5/package.py b/var/spack/repos/builtin/packages/hdf5/package.py index 50ad30222f..2f2f016177 100644 --- a/var/spack/repos/builtin/packages/hdf5/package.py +++ b/var/spack/repos/builtin/packages/hdf5/package.py @@ -263,7 +263,7 @@ HDF5 version {version} {version} spec['hdf5'].libs.ld_flags.split())) try: check = Executable('./check') - output = check(return_output=True) + output = check(output=str) except: output = "" success = output == expected diff --git a/var/spack/repos/builtin/packages/spark/package.py b/var/spack/repos/builtin/packages/spark/package.py index 3030fb1310..52eb5d7289 100644 --- a/var/spack/repos/builtin/packages/spark/package.py +++ b/var/spack/repos/builtin/packages/spark/package.py @@ -72,7 +72,7 @@ class Spark(Package): # spack_env.set('JAVA_HOME', self.spec['jdk'].prefix) hadoop = self.spec['hadoop'].command - hadoop_classpath = hadoop('classpath', return_output=True) + hadoop_classpath = hadoop('classpath', output=str) # Remove whitespaces, as they can compromise syntax in # module files -- cgit v1.2.3-60-g2f50