summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMario Melara <maamelara@gmail.com>2016-04-04 13:44:24 -0700
committerMario Melara <maamelara@gmail.com>2016-04-04 13:44:24 -0700
commit9c071ea40d6bacef2056184f7b256c2f1fb7cbd0 (patch)
tree3aec2492892cc94eafde2e42981e50bc3435ea35 /lib
parent7e9baf9e2533eb040aa142bd3bf6ffbd142516ac (diff)
downloadspack-9c071ea40d6bacef2056184f7b256c2f1fb7cbd0.tar.gz
spack-9c071ea40d6bacef2056184f7b256c2f1fb7cbd0.tar.bz2
spack-9c071ea40d6bacef2056184f7b256c2f1fb7cbd0.tar.xz
spack-9c071ea40d6bacef2056184f7b256c2f1fb7cbd0.zip
Changed modulecmd parameters. return_oe is not one of the parameters in the mainline spack repo. Changed the args to the appropriate ones in the new spack
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/compiler.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index e3ea918aca..c285c8a29d 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -285,16 +285,15 @@ class Compiler(object):
@classmethod
def find_in_modules(cls):
compilers = []
-
if cls.PrgEnv:
if not cls.PrgEnv_compiler:
tty.die('Must supply PrgEnv_compiler with PrgEnv')
modulecmd = which('modulecmd')
modulecmd.add_default_arg('python')
- output = modulecmd('avail', cls.PrgEnv_compiler, return_oe=True)
+
+ output = modulecmd('avail', cls.PrgEnv_compiler, output=str, error=str)
matches = re.findall(r'(%s)/([\d\.]+[\d])' % cls.PrgEnv_compiler, output)
-
for name, version in matches:
v = version
comp = cls(spack.spec.CompilerSpec(name + '@' + v), 'MODULES',