From a349a1ddfc1c199bad04e59d7eb6c7fe7d4d2ff2 Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Brian Inglis Date: Fri, 27 Oct 2023 13:26:50 -0600 Subject: [PATCH 2/7] fix no version for -C if only test release available Signed-off-by: Brian Inglis --- cygcheck-dep | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cygcheck-dep b/cygcheck-dep index 72e345f80987..5b7fa4cda9d9 100644 --- a/cygcheck-dep +++ b/cygcheck-dep @@ -11,7 +11,7 @@ ### DECLARATIONS name="cygcheck-dep" -version="3.0" +version="3.0-4" ## version(), help() /* @@ -645,17 +645,20 @@ fi L=''; P=''; C=''; R=''; V=''; O=''; D=''; T='' ## read and parse file; populate ${PkgID[]}, ${PkgName[]}, et al. /* +# fix no version for -C if only test release available: +# hold buffer => version seen: new package clears; version sets; +# test label checks and cycles if no version, otherwise skips rest of package L="$(sed -n ' :begin - /^@\s\+\(\S\+\)\s*$/{s//add_new_package_to_catalogue "\1"/p; b} + /^@\s\+\(\S\+\)\s*$/{s//add_new_package_to_catalogue "\1"/p; s/.*//; h; b} /^category:\s\+\(_obsolete\)\s*$/{s//PkgCategories[$MaxPkgID]="\1"; T="obsolete package"/p; b} /^category:\s\+\(\S\+\(\s\+\S\+\)*\)\s*$/{s//__make_list C "\1"; PkgCategories[$MaxPkgID]="$C"; T=''/p; b} - /^version:\s\+\(\S\+\)\s*$/{s//PkgVersionAvailable[$MaxPkgID]="\1"/p; b} + /^version:\s\+\(\S\+\)\s*$/{s//PkgVersionAvailable[$MaxPkgID]="\1"/p; h; b} /^obsoletes:\s\+\(\S\+\(\s\+\S\+\)*\)\s*$/{s//__make_list O "\1" ","; PkgObsoletedPkgs[$MaxPkgID]="$O"/p; b} /^requires:\s\+\(\S\+\(\s\+\S\+\)*\)\s*$/{s//[ "$T" ] \&\& { __make_list R "\1"; PkgRequisitesDeclared[$MaxPkgID]="$R"; }/p; b} /^depends2:\s\+\(\S\+\(\s\+\S\+\)*\)\s*$/{s//__make_list R "\1" ","; [ "$T" ] \&\& ObsoletePkgs[$MaxPkgID]="$R" || PkgRequisitesDeclared[$MaxPkgID]="$R"/p; b} /^\[prev\]/{:skip-prev n; /^@/b begin; b skip-prev} - /^\[test\]/{:skip-test n; /^@/b begin; b skip-test} + /^\[test\]/{:skip-test g; /^.\+$/!b; n; /^@/b begin; b skip-test} ' "$cw_setup_ini")" eval "$L" L='' -- 2.39.0