From 15713219e57a97048f4e3b085f9c75e188a67787 Mon Sep 17 00:00:00 2001
From: Mario Melara <maamelara@gmail.com>
Date: Wed, 20 Jan 2016 10:32:56 -0800
Subject: Better regular expression searching. Tested on edison was finding
test compilers and then spack was giving multiple compiler match errors
---
lib/spack/spack/compiler.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'lib')
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index 225c65917a..1a5be3c3fe 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -283,7 +283,7 @@ class Compiler(object):
modulecmd = which('modulecmd')
modulecmd.add_default_arg('python')
output = modulecmd('avail', cls.PrgEnv_compiler, return_oe=True)
- matches = re.findall(r'(%s)/(\d+[\.\d]+)' % cls.PrgEnv_compiler, output)
+ matches = re.findall(r'(%s)/([\d\.]+[\d$])' % cls.PrgEnv_compiler, output)
for name, version in matches:
v = version
--
cgit v1.2.3-70-g09d2