Merge branch 'maint'

This commit is contained in:
Dan McGee 2012-04-08 21:51:24 -05:00
commit 3a82885348

View file

@ -436,14 +436,10 @@ refresh_keys() {
} }
verify_sig() { verify_sig() {
local fd="$(mktemp)" if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify $SIGNATURE | grep -qE 'TRUST_(FULLY|ULTIMATE)'; then
"${GPG_PACMAN[@]}" --status-file "${fd}" --verify $SIGNATURE
if ! grep -q TRUST_FULLY "${fd}"; then
rm -f "${fd}"
error "$(gettext "The signature identified by %s could not be verified.")" "$SIGNATURE" error "$(gettext "The signature identified by %s could not be verified.")" "$SIGNATURE"
exit 1 exit 1
fi fi
rm -f "${fd}"
} }
updatedb() { updatedb() {