pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-07-04 21:00:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '191-modbuild-force-removing-modulefile-and-file-with-release-stage' into 'Pmodules-1.0'

Browse Source 
Resolve "modbuild: force removing modulefile and file with release stage"

See merge request Pmodules/src!165
This commit is contained in:
gsell
2023-02-09 09:08:06 +00:00
parent 5572b8ebc0 f7037dd28f
commit 563364e694
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libpbuild.bash
+3 -3
View File
@@ -1126,7 +1126,7 @@ pbuild::make_all() {
"%s " \
"${module_name}/${module_version}:" \
"removing modulefile '${modulefile_name}' ..."
[[ "${dry_run}" == 'no' ]] && rm -v "${modulefile_name}"
[[ "${dry_run}" == 'no' ]] && rm -vf "${modulefile_name}"
fi
local release_file="${modulefile_dir}/.release-${module_version}"
if [[ -e "${release_file}" ]]; then
@@ -1134,7 +1134,7 @@ pbuild::make_all() {
"%s " \
"${module_name}/${module_version}:" \
"removing release file '${release_file}' ..."
[[ "${dry_run}" == 'no' ]] && rm -v "${release_file}"
[[ "${dry_run}" == 'no' ]] && rm -vf "${release_file}"
fi
rmdir -p "${modulefile_dir}" 2>/dev/null || :
}
@@ -1153,7 +1153,7 @@ pbuild::make_all() {
if [[ -e "${modulefile_name}" ]] \
&& [[ -d ${PREFIX} ]] \
&& [[ ${force_rebuild} != 'yes' ]]; then
if [[ "${module_release}" == 'removed' ]]; then
if [[ "${module_release}" == 'removed' ]] || [[ "${module_release}" == 'remove' ]]; then
remove_module
else
std::info \