summaryrefslogtreecommitdiffstats
path: root/scripts/pacman-key.sh.in
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-06-06 05:47:26 +0200
committerAllan McRae <allan@archlinux.org>2013-06-06 05:47:26 +0200
commit9574bfd6c873d70e29a5003461b2d691f134c8ab (patch)
tree324d6f160f4f52c47e4c33aa73b76fbc473a21d9 /scripts/pacman-key.sh.in
parentcbbd3781c249c8318934fe0810a09546c2760f53 (diff)
parent450be928da1a71bebc3524f3f0bdb4160845b37e (diff)
downloadpacman-9574bfd6c873d70e29a5003461b2d691f134c8ab.tar.gz
pacman-9574bfd6c873d70e29a5003461b2d691f134c8ab.tar.xz
Merge branch 'maint'
Diffstat (limited to 'scripts/pacman-key.sh.in')
-rw-r--r--scripts/pacman-key.sh.in15
1 files changed, 4 insertions, 11 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 92875eff..30fba10b 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -310,19 +310,12 @@ populate_keyring() {
done
fi
- # Read the revoked key IDs to an array. The conversion from whatever is
- # inside the file to key ids is important, because key ids are the only
- # guarantee of identification for the keys.
local -A revoked_ids
for keyring in "${KEYRINGIDS[@]}"; do
- if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
- mapfile -t keys < "${KEYRING_IMPORT_DIR}/${keyring}-revoked"
- while IFS=: read _ _ _ _ key_id _; do
- if [[ -n $key_id ]]; then
- # Mark this key to be disabled
- revoked_ids[$key_id]="${keyring}"
- fi
- done < <("${GPG_PACMAN[@]}" --quiet --with-colons --list-keys "${keys[@]}" 2>/dev/null)
+ if [[ -s $KEYRING_IMPORT_DIR/$keyring-revoked ]]; then
+ while read -r key_id; do
+ revoked_ids["$key_id"]=1
+ done <"$KEYRING_IMPORT_DIR/$keyring-revoked"
fi
done