guix-attest: Avoid incomplete sigdirs with ERR traps

Sometimes GPG connects to the wrong agent... or you don't have your
smartcard handy...
This commit is contained in:
Carl Dong committed 2021-05-03 16:50:59 -04:00
1 parent feda2c8e31
commit d420e5c1c0
1 file changed
+5
+5
View File
@@ -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