From d420e5c1c015f58d07aca4d6a805086488f74d03 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 3 May 2021 15:33:43 -0400 Subject: guix-attest: Avoid incomplete sigdirs with ERR traps Sometimes GPG connects to the wrong agent... or you don't have your smartcard handy... --- contrib/guix/guix-attest | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'contrib') diff --git a/contrib/guix/guix-attest b/contrib/guix/guix-attest index 8b4746caf9..081d1c0465 100755 --- a/contrib/guix/guix-attest +++ b/contrib/guix/guix-attest @@ -156,6 +156,9 @@ for outdir in "${OUTDIRS[@]}"; do echo "${outname}: SKIPPING: Signature directory already exists in the specified guix.sigs repository" outdirs_already_attested_to+=("$outdir") else + # Clean up incomplete sigdir if something fails (likely gpg) + trap 'rm -rf "$outsigdir"' ERR + mkdir -p "$outsigdir" ( @@ -182,6 +185,8 @@ for outdir in "${OUTDIRS[@]}"; do echo "${outname}: Not signing SHA256SUMS as \$NO_SIGN is not empty" fi echo "" + + trap - ERR # Reset ERR trap fi done -- cgit v1.2.3