From 9e63b4571bc821de0fdd4a900f90b35baaf50074 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 4 Jul 2022 19:14:51 +0200
Subject: [PATCH] modbuild: querying dependencies fixed

and old cleanup_modulefiles() removed
---
 Pmodules/modbuild.in | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index 0e39831..ddec29a 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -524,35 +524,10 @@ build_modules_yaml(){
 		# if one of .with, .dependencies is not set, the vaulue is
 		# returned as 'null'.
 		local -i i
-		for ((i=0; i<${#_result[@]}; i++)); do
-			if [[ ${_result[$i]} == 'null' ]]; then
-				unset _result[$i]
-			fi
-		done
-	}
-
-	cleanup_modulefiles(){
-		local ol=''
-		for ol in "${Overlays[@]}"; do
-			[[ -v mod_overlays[${ol}] ]] && continue
-			local mod_root="${OverlayInfo[${ol}:mod_root]}"
-			local dir="${modulefile_dir/${ol_mod_root}/${mod_root}}"
-			local fname="${dir}/${module_version}"
-			if [[ -e "${fname}" ]]; then
-				std::info "%s "\
-					  "${module_name}/${module_version}:" \
-					  "removing modulefile from overlay '${ol}' ..."
-				rm "${fname}"
-			fi
-			fname="${dir}/.release-${module_version}"
-			if [[ -e "${fname}" ]]; then
-				std::info \
-					"%s " \
-					"${module_name}/${module_version}:" \
-					"removing release file from overlay '${ol}' ..."
-				rm "${fname}"
-			fi
+		for i in "${!_result[@]}"; do
+			[[ ${_result[$i]} == 'null' ]] && unset -v '_result[$i]'
 		done
+		_result=("${_result[@]}")
 	}
 
 	local name="$1"