pthbs

commit 94d862a20fa220da8144a0f7bdc227869a9af801
parent df2be0d2fb76f30dbbbfa280ceceb8aee4e8f350
Author: Jan Pobrislo <ccx@te2000.cz>
Date:   Mon,  5 May 2025 22:52:40 +0000

pass arguments to sandbox command

Diffstat:
M
command/pthbs-build
 | 
6
+++++-
M
command/pthbs-setup-gen.awk
 | 
1
+

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/command/pthbs-build b/command/pthbs-build
@@ -49,6 +49,7 @@ eval "$(
 BEGIN {
 	settings["sandbox"] = 1
 	settings["set_path"] = 1
+	settings["fail_digest"] = 1
 	FS=":"
 }
 function fatal(msg) {
@@ -60,6 +61,8 @@ function fatal(msg) {
 		settings["sandbox"] = 0
 	} else if($2 == "nopath") {
 		settings["set_path"] = 0
+	} else if($2 == "nofail_digest") {
+		settings["fail_digest"] = 0
 	} else {
 		fatal("unrecognized @pragma:")
 	}
@@ -68,6 +71,7 @@ function fatal(msg) {
 END {
 	print "setting_sandbox=" (settings["sandbox"]?"true":"false")
 	print "setting_set_path=" (settings["set_path"]?"true":"false")
+	print "setting_fail_digest=" (settings["fail_digest"]?"true":"false")
 	print "setting_ok=true"
 }
 ' "$1" )"
@@ -192,7 +196,7 @@ if test -n "$fail_reason"; then
 	rm -v "$(dirname "$logdir")/last_failed_build"
 	ln -v -s -f "$(basename "$logdir")" "$(dirname "$logdir")/last_failed_build"
 	find "$workdir" -name config.log -exec pthbs-copy-to-logdir "$logdir" '{}'  \;
-	pthbs-digest-tree >"$logdir/workdir-digest" "$workdir"
+	$setting_fail_digest && pthbs-digest-tree >"$logdir/workdir-digest" "$workdir"
 fi
 
 mkdir -p "$logdir"
diff --git a/command/pthbs-setup-gen.awk b/command/pthbs-setup-gen.awk
@@ -73,6 +73,7 @@ function sandbox_ns_common(args,    s) {
 	} else {
 		s = q(ENVIRON["pthbs_cache"]"/venv/bin/python")" "q(ENVIRON["pthbs_source"]"/sandbox/ns_sandbox.py")
 	}
+	s = s" "args
 	s = s" --versions="q(ENVIRON["pthbs_versions"])
 	s = s" --extra-mount=tmpfs:"q(ENVIRON["pthbs_workdir"])
 	s = s" --extra-mount=ro_bind:"q(ENVIRON["pthbs_pkgdir"]":"ENVIRON["pthbs_pkgdir"])