[pacman-dev] [PATCH 3/3] makepkg: reuse FAILED msg on unknown pubkey

[Dave Reisner]

This also fixes a missing newline in the output for this particular
case.

Before:
==> Verifying source file signatures with gpg...
    stunnel-4.42.tar.gz ... ==> WARNING: Unknown public key
FCD53E9D74C732D1
==> WARNING: Warnings have occurred while verifying the signatures.
    Please make sure you really trust them.

After:
==> Verifying source file signatures with gpg...
    stunnel-4.42.tar.gz ... FAILED
==> WARNING: Unknown public key FCD53E9D74C732D1
==> WARNING: Warnings have occurred while verifying the signatures.
    Please make sure you really trust them.

Signed-off-by: Dave Reisner <dreisner at archlinux.org>
---
 scripts/makepkg.sh.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 75d168b..58d47ed 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -730,11 +730,11 @@ check_pgpsigs() {
 		fi
 
 		if ! gpg --quiet --batch --status-file "$statusfile" --verify "$file" "$sourcefile" 2> /dev/null; then
+			echo "$(gettext "FAILED")" >&2
 			if grep "NO_PUBKEY" "$statusfile" > /dev/null; then
 				warning "$(gettext "Unknown public key") $(awk '/NO_PUBKEY/ {print $3}' $statusfile)" >&2
 				warnings=1
 			else
-				echo "$(gettext "FAILED")" >&2
 				errors=1
 			fi
 		else
-- 
1.7.6.1