Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts/pacman-key.sh.in
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-21 14:06:41 -0500
committerDan McGee <dan@archlinux.org>2011-09-22 11:14:35 -0500
commit491b656c548f13658c609784cf02af244ee97b23 (patch)
treed2eaabb3739dfc1f31d53946a31a2c755adda74b /scripts/pacman-key.sh.in
parent03e1b4caa9cf91ac3a3956b82e080dfc72b66a17 (diff)
pacman-key: don't hide --verify details in populate
Otherwise we're hiding extremely relevant bits like this one: gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/pacman-key.sh.in')
-rw-r--r--scripts/pacman-key.sh.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index 0c4d3aef..1bd6c25f 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -205,20 +205,22 @@ verify_keyring_input() {
local keyring keyfile
for keyring in "${KEYRINGIDS[@]}"; do
keyfile="${KEYRING_IMPORT_DIR}/${keyring}.gpg"
+ msg2 "$(gettext "Verifying %s...")" "${keyfile}"
if [[ ! -f "${keyfile}.sig" ]]; then
error "$(gettext "File %s is unsigned, cannot continue.")" "${keyfile}"
ret=1
- elif ! "${GPG_PACMAN[@]}" --verify "${keyfile}.sig" &>/dev/null; then
+ elif ! "${GPG_PACMAN[@]}" --verify "${keyfile}.sig"; then
error "$(gettext "The signature of file %s is not valid.")" "${keyfile}"
ret=1
fi
keyfile="${KEYRING_IMPORT_DIR}/${keyring}-revoked"
if [[ -f "${keyfile}" ]]; then
+ msg2 "$(gettext "Verifying %s...")" "${keyfile}"
if [[ ! -f "${keyfile}.sig" ]]; then
error "$(gettext "File %s is unsigned, cannot continue.")" "${keyfile}"
ret=1
- elif ! "${GPG_PACMAN[@]}" --verify "${keyfile}.sig" &>/dev/null; then
+ elif ! "${GPG_PACMAN[@]}" --verify "${keyfile}.sig"; then
error "$(gettext "The signature of file %s is not valid.")" "${keyfile}"
ret=1
fi