moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

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>
This commit is contained in:
Dan McGee 2011-09-21 14:06:41 -05:00
parent 03e1b4caa9
commit 491b656c54
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/pacman-key.sh.in
View File

@ -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