Merge branch '339-modulecmd-loading-lmod-files-as-dependencies-of-a-tcl-modulefile' into 'master'

Resolve "modulecmd: loading Lmod files as dependencies of a Tcl modulefile"

Closes #339

See merge request Pmodules/src!318

(cherry picked from commit af82391ef0)

dd14f9d3 modulecmd: loading Lmod modulefiles as deps of Tcl modulefile fixed

Co-authored-by: gsell <achim.gsell@psi.ch>
This commit is contained in:
2024-08-23 13:39:36 +02:00
parent 7356d230e2
commit f6ea0bd3a6
+10 -4
View File
@@ -658,10 +658,11 @@ USAGE:
'
subcommand_load() {
local relstage='undef'
local current_modulefile=''
local prefix=''
local m=''
local -- relstage='undef'
local -- current_modulefile=''
local -- prefix=''
local -- m=''
local -A interp
#......................................................................
# output load 'hints'
@@ -873,6 +874,8 @@ subcommand_load() {
# continue if already loaded
[[ ":${LOADEDMODULES}:" == *:${m}:* ]] && continue
interp[${current_modulefile}]="${modulecmd}"
# show info file if exist
local prefix=''
get_module_prefix prefix "${current_modulefile}"
@@ -884,6 +887,9 @@ subcommand_load() {
deps_file="${prefix}/.dependencies"
fi
test -r "${deps_file}" && load_dependencies "$_"
# load module
modulecmd="${interp[${current_modulefile}]}"
local output=''
output=$("${modulecmd}" 'bash' "${opts[@]}" 'load' \
"${current_modulefile}" 2> "${TmpFile}")