diff options
| -rw-r--r-- | functions | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 } |