Merge branch '119-modulecmd-fixes-in-loading-a-pmodules-module' into 'master'

Resolve "modulecmd: fixes in loading a Pmodules module"

Closes #119

See merge request Pmodules/src!88
This commit is contained in:
2021-05-11 13:37:31 +02:00
+2 -9
View File
@@ -2271,15 +2271,8 @@ if [[ -n ${PMODULES_ENV} ]]; then
eval "$("${base64}" -d <<< "${PMODULES_ENV}" 2>/dev/null)"
if [[ -z ${Version} ]] || [[ ${Version} != ${PMODULES_VERSION} ]]; then
# the Pmodules version changed!
# we save _LMFILES_ and LOADEDMODULES and restore them
# later. Otherwise the Pmodules module would not be listed
# by module list
declare saved_LMFILES_="${_LMFILES_}"
declare saved_LOADEDMODULES="${LOADEDMODULES}"
pmodules_init
_LMFILES_="${saved_LMFILES_}"
LOADEDMODULES="${saved_LOADEDMODULES}"
export_env _LMFILES_ LOADEDMODULES
declare -g Version="${PMODULES_VERSION}"
g_env_must_be_saved='yes'
fi
else
pmodules_init