From e52d5bbf1b0d10a7562635f4c00ea8738563875e Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Mon, 15 Jul 2024 18:49:26 +0200
Subject: [PATCH] build-system: fixes for unpacking with 7z

---
 Pmodules/modbuild.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Pmodules/modbuild.in b/Pmodules/modbuild.in
index e5e0268..56c324d 100755
--- a/Pmodules/modbuild.in
+++ b/Pmodules/modbuild.in
@@ -725,6 +725,11 @@ declare -A Yaml_default_config=(
 declare -A Yaml_valid_vk_keys=(
 	['config']=1			# !!map
 	['variants']=1			# !!map
+declare -A Unpackers=(
+	['tar']='tar'
+	['7z']='7z'
+)
+
 )
 	
 declare -A hierarchical_groups=()
@@ -1230,7 +1235,6 @@ build_modules_yaml_v1(){
 		std::die 3 "Key '$3' missing in $2\n----\n$1\n----"
 	}
 
-	local -A Unpackers=([tar]="tar" [7z]="7z")
 	set_urls() {
 		local -- yaml="$1"
 		local -i l=0
@@ -1274,7 +1278,6 @@ build_modules_yaml_v1(){
 								"${value}"
 						unpacker="${value}"
 						;;
-						;;
 					* )
 						die_invalid_key \
 							"${url_yaml}" \