diff options
| author | Mario Melara <maamelara@gmail.com> | 2019-05-20 11:06:02 -0700 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-05-20 11:06:02 -0700 |
| commit | 4d7111708088eeeeb9b2d558f490dfccee21e538 (patch) | |
| tree | 5b529531d1ce8128c1053489b7beec5452eb494d /lib | |
| parent | 2168c08ac5b29f585e9377d1045fadfe42d58c36 (diff) | |
| download | spack-4d7111708088eeeeb9b2d558f490dfccee21e538.tar.gz spack-4d7111708088eeeeb9b2d558f490dfccee21e538.tar.bz2 spack-4d7111708088eeeeb9b2d558f490dfccee21e538.tar.xz spack-4d7111708088eeeeb9b2d558f490dfccee21e538.zip | |
Get Cray OS version from PrgEnv-cray (#10774)
The regex used for finding the Cray OS version from the PrgEnv-cray
module was not exact and was at times pulling the version from other
PrgEnv modules. This updates the regular expression to be more exact.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/operating_systems/cnl.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/operating_systems/cnl.py b/lib/spack/spack/operating_systems/cnl.py index 7d21d6ef86..59b6e980a2 100644 --- a/lib/spack/spack/operating_systems/cnl.py +++ b/lib/spack/spack/operating_systems/cnl.py @@ -29,8 +29,8 @@ class Cnl(OperatingSystem): return self.name + str(self.version) def _detect_crayos_version(self): - output = module("avail", "PrgEnv-") - matches = re.findall(r'PrgEnv-\w+/(\d+).\d+.\d+', output) + output = module("avail", "PrgEnv-cray") + matches = re.findall(r'PrgEnv-cray/(\d+).\d+.\d+', output) major_versions = set(matches) latest_version = max(major_versions) return latest_version |