modbuild: removing modules fixed

This commit is contained in:
2023-11-29 16:05:51 +01:00
parent be7d8517ac
commit f56f493654
2 changed files with 28 additions and 1 deletions
+9 -1
View File
@@ -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
+19
View File
@@ -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}" ) || \