From e30338240aedfd3225333f916841ea3965eb6a59 Mon Sep 17 00:00:00 2001 From: gsell Date: Mon, 2 Sep 2024 18:25:20 +0200 Subject: [PATCH] Merge branch '350-build-system-handle-empty-variants-blocks' into 'master' Resolve "build-system: handle empty variants blocks" Closes #350 See merge request Pmodules/src!347 (cherry picked from commit ffbc6292eb32198edac7acd533ecf96ddfead19b) 047d55d8 build-system: bugfix: handle empty variants Co-authored-by: gsell --- Pmodules/modbuild.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index 16a23d2..7121b44 100644 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -818,6 +818,11 @@ build_modules_yaml_v1(){ local -- type_of_key='' type_of_key=$( ${yq} -e ".variants | type" 2>/dev/null <<<"${yaml_input}") + if [[ "${type_of_key}" == '!!null' ]]; then + result='' + n=0 + return 0 + fi if [[ "${type_of_key}" != '!!seq' ]]; then die_invalid_variants_block "${name}" "${version}" \ "${type_of_key}"