summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2012-04-08 14:02:39 -0400
committerDan McGee <dan@archlinux.org>2012-04-08 17:43:53 -0500
commitf053141c8744b3f15ffdf488705fb7606cf1ab35 (patch)
treee225c426136a2ac3c0459c3810c69a2c374854fe /scripts
parentb752561a52a88f8e9cc3bcc9c2079eb685245110 (diff)
downloadpacman-f053141c8744b3f15ffdf488705fb7606cf1ab35.tar.xz
pacman-key: verify TRUST_ULTIMATE keys as good
Extend our grep pattern to match TRUST_ULTIMATE, not just TRUST_FULLY, as these keys are to be trusted as well. Signed-off-by: Dave Reisner <dreisner@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/pacman-key.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 9a77a19f..1a2bac34 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -441,7 +441,7 @@ refresh_keys() {
verify_sig() {
local fd="$(mktemp)"
"${GPG_PACMAN[@]}" --status-file "${fd}" --verify $SIGNATURE
- if ! grep -q TRUST_FULLY "${fd}"; then
+ if ! grep -qE 'TRUST_(FULLY|ULTIMATE)' "${fd}"; then
rm -f "${fd}"
error "$(gettext "The signature identified by %s could not be verified.")" "$SIGNATURE"
exit 1