pacman-key: simplify trusted keyring iteration
Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
41db62b77a
commit
2a73f4e994
|
@ -301,14 +301,12 @@ populate_keyring() {
|
||||||
local -A trusted_ids
|
local -A trusted_ids
|
||||||
for keyring in "${KEYRINGIDS[@]}"; do
|
for keyring in "${KEYRINGIDS[@]}"; do
|
||||||
if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
|
if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
|
||||||
while read key; do
|
while IFS=: read key_id _; do
|
||||||
# skip comments; these are valid in this file
|
# skip blank lines, comments; these are valid in this file
|
||||||
[[ $key = \#* ]] && continue
|
[[ -z $key_id || ${key_id:0:1} = \# ]] && continue
|
||||||
key_id="${key%%:*}"
|
|
||||||
if [[ -n ${key_id} ]]; then
|
# Mark this key to be lsigned
|
||||||
# Mark this key to be lsigned
|
trusted_ids[$key_id]=$keyring
|
||||||
trusted_ids[$key_id]="${keyring}"
|
|
||||||
fi
|
|
||||||
done < "${KEYRING_IMPORT_DIR}/${keyring}-trusted"
|
done < "${KEYRING_IMPORT_DIR}/${keyring}-trusted"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in New Issue