diff options
| author | Dan McGee <dan@archlinux.org> | 2011-09-21 21:06:41 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-09-22 18:14:35 +0200 |
| commit | 491b656c548f13658c609784cf02af244ee97b23 (patch) | |
| tree | d2eaabb3739dfc1f31d53946a31a2c755adda74b | |
| parent | 03e1b4caa9cf91ac3a3956b82e080dfc72b66a17 (diff) | |
| download | pacman-491b656c548f13658c609784cf02af244ee97b23.tar.gz pacman-491b656c548f13658c609784cf02af244ee97b23.tar.xz | |
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>
| -rw-r--r-- | scripts/pacman-key.sh.in | 6 |
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 |