Versioning

commit 8b14583bd3dd5934f532e503e7bd13f13ef87f6d
parent 851774b596b11b5d5620f38f13fc2957345e6b2d
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Sat,  9 Dec 2023 00:29:56 +0100

bugfixes to apply_patchset

Diffstat:
M
tools/apply_patchset
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/apply_patchset b/tools/apply_patchset
@@ -18,6 +18,7 @@ main() {
 	- verify_patch_set $@
 	- install_patch_set $@
 }
+typeset -f -t main
 
 # ---
 
@@ -60,7 +61,7 @@ parse_patch() {
 			if [[ $line == '' ]]; then
 				break
 			fi
-			line=${line%%--[[:space:]]#}
+			line=${line##--[[:space:]]#}
 			case $line in
 				(VDEP:*) deps+=${line#VDEP:};;
 				(VCON:*) cons+=${line#VCON:};;
@@ -134,7 +135,7 @@ extend_conflict_list() {
 		- err_msg ERROR cannot install patch $2 as it creates conflict with $1 in the current database
 		- print_con_traceback $1
 		exit 3
-	elif (( $+verify_patch[$1] )); then
+	elif (( $+verify_install[$1] )); then
 		- err_msg ERROR cannot install patch $2 as it creates conflict with another patch
 		- print_con_traceback $1
 		- print_dep_traceback $1
@@ -145,7 +146,7 @@ extend_conflict_list() {
 verify_patch() {
 	[[ $# == 2 ]] || die "exactly two arguments required"
 	# (( ${installed_patches[(I)$1]} )) && return 0
-	$+verify_patch[$1] && return 0
+	(( $+verify_install[$1] )) && return 0
 	local -a deps cons
 	local dep con
 	extend_install_list $1 $2