Merge bitcoin/bitcoin#22643: guix-verify: Non-zero exit code when anything fails

d451b60d22 guix-verify: Non-zero exit code when anything fails (Carl Dong)

Pull request description:

  ```
  Previously, if verification fails, the correct message will be printed,
  but the exit code would still be 0.
  ```

ACKs for top commit:
  achow101:
    ACK d451b60d22

Tree-SHA512: 695d72121f308d8a66db780eca16878fb378b4d766de5b58c2d6f778c5661a2f7bdf37a96e8e8e283b0a46b5d55f24bca05fa7509aa1822f0854c50064200572
pull/22673/head
fanquake 3 years ago
commit a9509fedc8
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1

@ -77,11 +77,13 @@ verify() {
echo "" echo ""
echo "Hint: Either the signature is invalid or the public key is missing" echo "Hint: Either the signature is invalid or the public key is missing"
echo "" echo ""
failure=1
elif ! diff --report-identical "$compare_manifest" "$current_manifest" 1>&2; then elif ! diff --report-identical "$compare_manifest" "$current_manifest" 1>&2; then
echo "ERR: The SHA256SUMS attestation in these two directories differ:" echo "ERR: The SHA256SUMS attestation in these two directories differ:"
echo " '${compare_manifest}'" echo " '${compare_manifest}'"
echo " '${current_manifest}'" echo " '${current_manifest}'"
echo "" echo ""
failure=1
else else
echo "Verified: '${current_manifest}'" echo "Verified: '${current_manifest}'"
echo "" echo ""
@ -166,3 +168,7 @@ if (( ${#all_noncodesigned[@]} + ${#all_all[@]} == 0 )); then
echo "" echo ""
exit 1 exit 1
fi fi
if [ -n "$failure" ]; then
exit 1
fi

Loading…
Cancel
Save