Skip to content

Commit 5af05dc

Browse files
authored
Merge pull request #4392 from branfosj/resolve
resolve templated values in extension names in `_make_extension_list`
2 parents 05d6af2 + 737d778 commit 5af05dc

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

easybuild/framework/easyblock.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,9 +1739,15 @@ def _make_extension_list(self):
17391739
17401740
Each entry should be a (name, version) tuple or just (name, ) if no version exists
17411741
"""
1742-
# We need only name and version, so don't resolve templates
17431742
# Each extension in exts_list is either a string or a list/tuple with name, version as first entries
1744-
return [(ext, ) if isinstance(ext, string_type) else ext[:2] for ext in self.cfg.get_ref('exts_list')]
1743+
# As name can be a templated value we must resolve templates
1744+
exts_list = []
1745+
for ext in self.cfg.get_ref('exts_list'):
1746+
if isinstance(ext, string_type):
1747+
exts_list.append((resolve_template(ext, self.cfg.template_values), ))
1748+
else:
1749+
exts_list.append((resolve_template(ext[0], self.cfg.template_values), ext[1]))
1750+
return exts_list
17451751

17461752
def make_extension_string(self, name_version_sep='-', ext_sep=', ', sort=True):
17471753
"""

0 commit comments

Comments
 (0)