summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorJulian Andres Klode <jak@debian.org>2022-01-07 12:43:32 +0100
committerJulian Andres Klode <jak@debian.org>2022-02-22 18:25:06 +0100
commit56adf743b02b80a9acc9a2e480bfd15acb94f755 (patch)
tree36c05dda8274832bc8d0af8d03cd38faf13ae63d /cmdline
parent9aee35d1acafde2e443741160d13d365345383ab (diff)
Warn if the legacy trusted.gpg keyring is used for verification
With apt-key going away, people need to manage key files, rather than keys, so they need to know if any keys are in the legacy keyring.
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-key.in3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in
index 3c83a8b3d..80b0c2ade 100644
--- a/cmdline/apt-key.in
+++ b/cmdline/apt-key.in
@@ -645,6 +645,9 @@ if [ -z "$TRUSTEDFILE" ]; then
TRUSTEDFILE="/etc/apt/trusted.gpg"
eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
+ if [ "$APT_KEY_NO_LEGACY_KEYRING" ]; then
+ TRUSTEDFILE="/dev/null"
+ fi
fi
command="$1"