From ba2e4b2c52ed7e62ea96644f16fd42113db2730c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 25 Mar 2011 14:27:37 -0400 Subject: Add a warning message if the keyring file is not available, and --no-check-gpg is not specified. --- debian/changelog | 2 ++ functions | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1ad88c3..3c15b01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ debootstrap (1.0.30) UNRELEASED; urgency=low * Add --no-check-gpg option that can be used to disable release file verification. * Needs base-installer 1.117. + * Add a warning message if the keyring file is not available, and + --no-check-gpg is not specified. -- Joey Hess Fri, 25 Mar 2011 14:12:43 -0400 diff --git a/functions b/functions index 99e34c5..e066922 100644 --- a/functions +++ b/functions @@ -476,6 +476,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" fi } -- cgit v1.2.3