Skip to content

Commit d420e5c

Browse files
committed
guix-attest: Avoid incomplete sigdirs with ERR traps
Sometimes GPG connects to the wrong agent... or you don't have your smartcard handy...
1 parent feda2c8 commit d420e5c

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

contrib/guix/guix-attest

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,9 @@ for outdir in "${OUTDIRS[@]}"; do
156156
echo "${outname}: SKIPPING: Signature directory already exists in the specified guix.sigs repository"
157157
outdirs_already_attested_to+=("$outdir")
158158
else
159+
# Clean up incomplete sigdir if something fails (likely gpg)
160+
trap 'rm -rf "$outsigdir"' ERR
161+
159162
mkdir -p "$outsigdir"
160163

161164
(
@@ -182,6 +185,8 @@ for outdir in "${OUTDIRS[@]}"; do
182185
echo "${outname}: Not signing SHA256SUMS as \$NO_SIGN is not empty"
183186
fi
184187
echo ""
188+
189+
trap - ERR # Reset ERR trap
185190
fi
186191
done
187192

0 commit comments

Comments
 (0)