From 1f8b2599f6beb14e8855f5d43fc1a759a08690e9 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 4 Sep 2010 15:28:47 +0200 Subject: * cmdline/apt-key: - support also Dir::Etc::Trusted so that apt-key works in the same way as the library part which works with the trusted files --- cmdline/apt-key | 2 ++ 1 file changed, 2 insertions(+) (limited to 'cmdline') diff --git a/cmdline/apt-key b/cmdline/apt-key index 27731ef7d..b39ab12e4 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -147,11 +147,13 @@ else #echo "generate list" TRUSTEDFILE="/etc/apt/trusted.gpg" eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) + eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) if [ -r "$TRUSTEDFILE" ]; then GPG="$GPG --keyring $TRUSTEDFILE" fi GPG="$GPG --primary-keyring $TRUSTEDFILE" TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) if [ -d "$TRUSTEDPARTS" ]; then #echo "parts active" for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do -- cgit v1.2.3