From 09fe3894d64c25f80047af403f2834984febc5b9 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Tue, 13 Aug 2024 15:22:33 +0200
Subject: [PATCH] modulecmd: set group depth to 0 for modules outside the
 hierarchy

---
 Pmodules/libpmodules.bash.in | 3 ++-
 Pmodules/modulecmd.bash.in   | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Pmodules/libpmodules.bash.in b/Pmodules/libpmodules.bash.in
index a30449a..cab81e4 100644
--- a/Pmodules/libpmodules.bash.in
+++ b/Pmodules/libpmodules.bash.in
@@ -2,7 +2,7 @@
 
 declare    PMODULES_MODULEFILES_DIR='modulefiles'
 declare    PMODULES_VERSION='@PMODULES_VERSION@'
-declare -A GroupDepths=()
+declare -A GroupDepths=(['none']=0)
 
 declare -a Overlays=()
 declare -A OverlayInfo
@@ -58,6 +58,7 @@ scan_groups () {
 			Dir2OverlayMap[${dir%/"${PMODULES_MODULEFILES_DIR}"*}]="${ol}"
 	        done
         done
+	GroupDepths['none']=0
 }
 
 declare -A DefaultPmodulesConfig=(
diff --git a/Pmodules/modulecmd.bash.in b/Pmodules/modulecmd.bash.in
index bf65aaa..6dae723 100644
--- a/Pmodules/modulecmd.bash.in
+++ b/Pmodules/modulecmd.bash.in
@@ -626,6 +626,7 @@ subcommand_load() {
 				output+="module use ${relstage}; "
 			fi
 			local group=${line[2]}
+			[[ "${group}" != 'none' ]] || continue
 	        	if [[ ! ":${UsedGroups}:" == *:${group}:* ]] && \
 				   (( ${GroupDepths[${group}]} == 0 )); then
 				output+="module use ${group}; "