diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2017-06-15 04:27:18 -0500 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2017-06-15 11:27:18 +0200 |
| commit | e62744741785075c535c739b2b0613ebbe4aa0b6 (patch) | |
| tree | 52a0c7afdbf663a0856fe8d8121de2c21e23d49f /var | |
| parent | ce11e78530f28d58693764bdc3893a268028bd48 (diff) | |
| download | spack-e62744741785075c535c739b2b0613ebbe4aa0b6.tar.gz spack-e62744741785075c535c739b2b0613ebbe4aa0b6.tar.bz2 spack-e62744741785075c535c739b2b0613ebbe4aa0b6.tar.xz spack-e62744741785075c535c739b2b0613ebbe4aa0b6.zip | |
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
Diffstat (limited to 'var')
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5-blosc/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/hdf5/package.py | 2 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/spark/package.py | 2 |
3 files changed, 3 insertions, 3 deletions
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 |