Skip to content

Commit 1de2441

Browse files
authored
Merge pull request #4721 from branfosj/extended_dry_run
make sure `type module` is run during a dry run
2 parents 5e01424 + acd1cda commit 1de2441

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.github/workflows/end2end.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
"eb --show-system-info"
5757
"eb --check-eb-deps"
5858
"eb --show-config"
59+
"eb -x bzip2-1.0.8.eb"
5960
)
6061
for cmd in "${cmds[@]}"; do
6162
echo ">>> $cmd"

easybuild/tools/modules.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ def check_module_function(self, allow_mismatch=False, regex=None):
308308
output, exit_code = None, EasyBuildExit.FAIL_SYSTEM_CHECK
309309
else:
310310
cmd = "type module"
311-
res = run_shell_cmd(cmd, fail_on_error=False, in_dry_run=False, hidden=True, output_file=False)
311+
res = run_shell_cmd(cmd, fail_on_error=False, in_dry_run=True, hidden=True, output_file=False)
312312
output, exit_code = res.output, res.exit_code
313313

314314
if regex is None:
@@ -1367,7 +1367,7 @@ def check_module_function(self, allow_mismatch=False, regex=None):
13671367
out, ec = None, 1
13681368
else:
13691369
cmd = "type _module_raw"
1370-
res = run_shell_cmd(cmd, fail_on_error=False, in_dry_run=False, hidden=True, output_file=False)
1370+
res = run_shell_cmd(cmd, fail_on_error=False, in_dry_run=True, hidden=True, output_file=False)
13711371
out, ec = res.output, res.exit_code
13721372

13731373
if regex is None:

0 commit comments

Comments
 (0)