From 21c6b2097ea55b1b4677975493e846e6d7f63a80 Mon Sep 17 00:00:00 2001 From: Aleksa Sarai Date: Thu, 5 Mar 2026 00:42:04 +1100 Subject: [PATCH] keyring: validate: allow maintainers to have no keys Some maintainers appear to have removed their PGP keys, which causes "gpg --import" during "make validate-keyring" to fail. The solution is to switch to a non-fatal warning if no keys were imported. Signed-off-by: Aleksa Sarai (cherry picked from commit 936a59b07f62abddd441c4037938557b61823de8) Signed-off-by: Aleksa Sarai --- script/keyring_validate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/keyring_validate.sh b/script/keyring_validate.sh index cb331f62e..65aa9e1e5 100755 --- a/script/keyring_validate.sh +++ b/script/keyring_validate.sh @@ -47,7 +47,10 @@ echo "------------------------------------------------------------" # Create a dummy gpg keyring from the set of MAINTAINERS. while IFS="" read -r username || [ -n "$username" ]; do - curl -sSL "https://github.com/$username.gpg" | gpg_user "$username" --import + keydata="$(curl -sSL "https://github.com/$username.gpg")" + if ! gpg_user "$username" --import <<<"$keydata"; then + log "WARNING: $username does not have any GPG keys on GitHub." + fi done < <(printf '%s\n' "${maintainers[@]}") # Make sure all of the keys in the keyring have a github=... comment.