From 3d4df78def54b5dc57eae998c6eabeb88e19aacd Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 9 Dec 2021 18:00:53 +0100 Subject: [PATCH] modulecmd: use_group() fix bug with replacing overlays --- Pmodules/modulecmd.bash.in | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in index 6a0e1b0..8c7d659 100644 --- a/Pmodules/modulecmd.bash.in +++ b/Pmodules/modulecmd.bash.in @@ -1496,16 +1496,14 @@ subcommand_use() { "${arg}" fi std::append_path UsedGroups "$1" - local overlay group - for overlay in "${OverlayList[@]}"; do - for group in ${UsedGroups//:/ }; do - local dir="${overlay}/" - dir+="${group}/${PMODULES_MODULEFILES_DIR}" - if [[ -d "${dir}" ]]; then - std::prepend_path MODULEPATH "${dir}" - Dir2OverlayMap[${dir}]=${overlay} - fi - done + local ol_dir + for ol_dir in "${OverlayList[@]}"; do + local dir="${ol_dir}/$1/${PMODULES_MODULEFILES_DIR}" + [[ -d "${dir}" ]] || continue + + std::prepend_path MODULEPATH "${dir}" + Dir2OverlayMap[${dir}]=${ol_dir} + [[ "${OverlayDict[${ol_dir}]}" == "${ol_replacing}" ]] && break done }