diff options
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | functions | 2 |
2 files changed, 4 insertions, 0 deletions
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 <joeyh@debian.org> Fri, 25 Mar 2011 14:12:43 -0400 @@ -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 } |