Skip to content

Commit 73c498f

Browse files
authored
Merge pull request #4998 from boegel/Lmod8765
update regex used in `Lmod.get_setenv_value_from_modulefile`
2 parents d1631b4 + de0da3c commit 73c498f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/unit_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
setup:
1414
runs-on: ubuntu-latest
1515
outputs:
16-
lmod8: Lmod-8.7.58
16+
lmod8: Lmod-8.7.65
1717
modules4: modules-4.5.3
1818
modules5: modules-5.3.1
1919
steps:

easybuild/tools/modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2112,11 +2112,11 @@ def get_setenv_value_from_modulefile(self, mod_name, var_name):
21122112
"""
21132113
# Lmod produces "module show" output with setenv statements like:
21142114
# setenv("EBROOTBZIP2","/tmp/software/bzip2/1.0.6")
2115-
# - line starts with setenv(
2115+
# - line starts with setenv( or setenv{ (see also https://github.com/TACC/Lmod/issues/792)
21162116
# - both variable name and value are enclosed in double quotes, separated by comma
21172117
# - value can contain spaces!
21182118
# - line ends with )
2119-
regex = re.compile(r'^setenv\("%s"\s*,\s*"(?P<value>.+)"\)' % var_name, re.M)
2119+
regex = re.compile(r'^setenv[\({]"%s"\s*,\s*"(?P<value>.+)"[\)}]' % var_name, re.M)
21202120
value = self.get_value_from_modulefile(mod_name, regex, strict=False)
21212121

21222122
if value:

0 commit comments

Comments
 (0)