Skip to content

Commit 02ed943

Browse files
authored
Merge pull request #4331 from wpoely86/fix
only add extensions in module file if there are extensions
2 parents dfa95a3 + f725ac2 commit 02ed943

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

easybuild/tools/module_generator.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,8 @@ def _generate_extensions_list(self):
622622
"""
623623
Generate a list of all extensions in name/version format
624624
"""
625-
return self.app.make_extension_string(name_version_sep='/', ext_sep=',').split(',')
625+
exts_str = self.app.make_extension_string(name_version_sep='/', ext_sep=',')
626+
return exts_str.split(',') if exts_str else []
626627

627628
def _generate_help_text(self):
628629
"""

test/framework/module_generator.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,16 @@ def test_module_extensions(self):
756756
regex = re.compile(pattern, re.M)
757757
self.assertTrue(regex.search(desc), "Pattern '%s' found in: %s" % (regex.pattern, desc))
758758

759+
# check if the extensions is missing if there are no extensions
760+
test_ec = os.path.join(test_dir, 'easyconfigs', 'test_ecs', 't', 'toy', 'toy-0.0-test.eb')
761+
762+
ec = EasyConfig(test_ec)
763+
eb = EasyBlock(ec)
764+
modgen = self.MODULE_GENERATOR_CLASS(eb)
765+
desc = modgen.get_description()
766+
767+
self.assertFalse(re.search(r"\s*extensions\(", desc), "No extensions found in: %s" % desc)
768+
759769
def test_prepend_paths(self):
760770
"""Test generating prepend-paths statements."""
761771
# test prepend_paths

0 commit comments

Comments
 (0)