bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pacman-key: handle local signing of multiple keys

Browse source 
gpg --lsign-key does not like being given multiple keys to sign.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2012-06-19 14:55:35 +10:00
parent 86eefc1a3a
commit 09295f7e40
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scripts/pacman-key.sh.in
View file

@ -300,10 +300,7 @@ populate_keyring() {
if (( ${#trusted_ids[@]} > 0 )); then if (( ${#trusted_ids[@]} > 0 )); then
msg "$(gettext "Locally signing trusted keys in keyring...")" msg "$(gettext "Locally signing trusted keys in keyring...")"
for key_id in "${!trusted_ids[@]}"; do lsign_keys "${!trusted_ids[@]}"
msg2 "$(gettext "Locally signing key %s...")" "${key_id}"
lsign_keys "${key_id}"
done
msg "$(gettext "Importing owner trust values...")" msg "$(gettext "Importing owner trust values...")"
for keyring in "${KEYRINGIDS[@]}"; do for keyring in "${KEYRINGIDS[@]}"; do
if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then if [[ -s "${KEYRING_IMPORT_DIR}/${keyring}-trusted" ]]; then
@ -440,10 +437,19 @@ list_sigs() {
lsign_keys() { lsign_keys() {
check_keyids_exist check_keyids_exist
# we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid
printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "$@" 2>/dev/null local ret=0
if (( PIPESTATUS[1] )); then for key_id in "$@"; do
error "$(gettext "A specified key could not be locally signed.")" msg2 "$(gettext "Locally signing key %s...")" "${key_id}"
# we cannot use --yes here as gpg would still ask for confirmation if a key has more than one uid
printf 'y\ny\n' | LANG=C "${GPG_PACMAN[@]}" --command-fd 0 --quiet --batch --lsign-key "${key_id}" 2>/dev/null
if (( PIPESTATUS[1] )); then
error "$(gettext "%s could not be locally signed.")" "${key_id}"
ret=1
fi
done
if (( ret )); then
exit 1 exit 1
fi fi
} }