From c72e1705e402c17255493a7c3062b3cc86ac3b72 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Mar 2011 14:35:02 -0400 Subject: improve warning message --- functions | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/functions b/functions index e066922..f0ffe10 100644 --- a/functions +++ b/functions @@ -192,8 +192,9 @@ download_style () { } keyring () { - if [ -z "$KEYRING" ] && [ -e "$1" ]; then - KEYRING="$1" + KEYRING_WANTED="$1" + if [ -z "$KEYRING" ] && [ -e "$KEYRING_WANTED" ]; then + KEYRING="$KEYRING_WANTED" fi } @@ -476,8 +477,8 @@ download_release_sig () { (gpgv --status-fd 1 --keyring "$KEYRING" --ignore-time-conflict \ "$relsigdest" "$reldest" || true) | read_gpg_status progress 100 100 DOWNRELSIG "Downloading Release file signature" - elif [ -z "$DISABLE_KEYRING" ]; then - warning KEYRING "Cannot verify gpg signature; keyring file %s is not available" "$KEYRING" + elif [ -z "$DISABLE_KEYRING" ] && [ -n "$KEYRING_WANTED" ]; then + warning KEYRING "Cannot check Release signature; keyring file not available %s" "$KEYRING_WANTED" fi } -- cgit v0.12