Revoke keys unconditionally

update-keys

@@ -44,12 +44,8 @@ while read -ra data; do
 	${GPG} --recv-keys ${keyid} &>/dev/null
 	printf 'clean\nquit\ny\n' | \
 		${GPG} --command-fd 0 --edit-key ${keyid}
-	if ! ${GPG} --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:'; then
-		${GPG} --armor --no-emit-version --export-options export-minimal --export ${keyid} >> master-revoked/${username}.asc
-		echo "${keyid}" >> archlinux-revoked
-	else
-		echo "key is still fully trusted: ${keyid} ${username}"
-	fi
+	${GPG} --armor --no-emit-version --export-options export-minimal --export ${keyid} >> master-revoked/${username}.asc
+	echo "${keyid}" >> archlinux-revoked
 done < master-revoked-keyids
 
 while read -ra data; do
@@ -74,12 +70,8 @@ while read -ra data; do
 	${GPG} --recv-keys ${keyid} &>/dev/null
 	printf 'clean\nquit\ny\n' | \
 		${GPG} --command-fd 0 --edit-key ${keyid}
-	if ! ${GPG} --list-keys --with-colons ${keyid} 2>/dev/null | grep -q '^pub:f:'; then
-		${GPG} --armor --no-emit-version --export-options export-minimal --export ${keyid} >> packager-revoked/${username}.asc
-		echo "${keyid}" >> archlinux-revoked
-	else
-		echo "key is still fully trusted: ${keyid} ${username}"
-	fi
+	${GPG} --armor --no-emit-version --export-options export-minimal --export ${keyid} >> packager-revoked/${username}.asc
+	echo "${keyid}" >> archlinux-revoked
 done < packager-revoked-keyids
 
 cat master/*.asc master-revoked/*.asc packager/*.asc packager-revoked/*.asc > archlinux.gpg