From f56f4936547b7e23daca66ddddefc2db1a5a22f7 Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Wed, 29 Nov 2023 16:05:51 +0100
Subject: [PATCH] modbuild: removing modules fixed

---
 Pmodules/libpbuild.bash | 10 +++++++++-
 Pmodules/modbuild.in    | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Pmodules/libpbuild.bash b/Pmodules/libpbuild.bash
index 33895a7..42dd0e6 100644
--- a/Pmodules/libpbuild.bash
+++ b/Pmodules/libpbuild.bash
@@ -1709,6 +1709,14 @@ _build_module() {
 				"removing release file '${release_file}' ..."
 			[[ "${dry_run}" == 'no' ]] && ${rm} -vf "${release_file}"
 		fi
+		release_file="${modulefile_dir}/.config-${module_version}"
+		if [[ -e "${release_file}" ]]; then
+			std::info \
+				"%s " \
+				"${module_name}/${module_version}:" \
+				"removing release file '${release_file}' ..."
+			[[ "${dry_run}" == 'no' ]] && ${rm} -vf "${release_file}"
+		fi
 		${rmdir} -p "${modulefile_dir}" 2>/dev/null || :
 	}
 
@@ -1767,7 +1775,7 @@ _build_module() {
 		"${module_name}/${module_version}:" \
 		${with_modules:+build with ${with_modules[@]}}
 
-	if [[ "${module_release}" == 'removed' ]]; then
+	if [[ "${module_release}" == 'remove' ]]; then
 		remove_module
 	elif [[ "${module_release}" == 'deprecated' ]]; then
 		deprecate_module
diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index eb7e63f..82d9b00 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -739,6 +739,25 @@ build_modules_yaml_v1(){
 							;;
 					esac
 					;;
+				relstage )
+					value=$( ${yq} ".${key}" \
+						       2>/dev/null <<<"${yaml_input}" ) || \
+						value=''
+					case ${value,,} in
+						unstable | stable | deprecated )
+							cfg[${key}]="${value,,}"
+							;;
+						remove | removed )
+							cfg[${key}]='remove'
+							;;
+						* )
+							std::die 3 "%s '%s' -- %s" \
+								 "Invalid value for" \
+								 'relstage' \
+								 "${value}"
+							;;
+					esac
+					;;
 				urls | group_deps )
 					value=$( ${yq} -e ".${key}" \
 						       2>/dev/null <<<"${yaml_input}" ) || \