From fee6b2e33b15eab4906e2ba0366bd1a1cb855434 Mon Sep 17 00:00:00 2001 From: gsell Date: Fri, 30 Aug 2024 14:24:22 +0200 Subject: [PATCH] Merge branch '349-build-system-error-in-reading-variants-in-yaml-config-file' into 'master' Resolve "build-system: error in reading variants in YAML config file" Closes #349 See merge request Pmodules/src!345 (cherry picked from commit afe5d0034c176855d2aa0b7aaddbeabcc8eb2380) e6bae349 build-system: bugfix in reading YAML version config Co-authored-by: gsell --- Pmodules/modbuild.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in index f728006..16a23d2 100644 --- a/Pmodules/modbuild.in +++ b/Pmodules/modbuild.in @@ -1474,13 +1474,13 @@ build_modules_yaml_v1(){ used_keys # read (default) config of version if set - local -A vk_config=() local -- yaml_version_config='' if [[ -v used_keys['config'] ]]; then - yaml_version_config=$(${yq} '.config' <<<"${yaml_vk_config}" 2>/dev/null) + yaml_version_config=$(${yq} '.config' <<<"${yaml_version_block}" 2>/dev/null) debug "vk input: ${yaml_version_config}" fi # reminder: if YAML input is empty, next line copies defaults to 'vk_config' + local -A vk_config=() yml::get_config \ yaml_version_config \ vk_config \