* buildlib/configure.mak:

[apt.git] / cmdline / apt-key

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 97d6e03235ea6738dd2074d58e27f508fa3c9c91..c184e3e755b44f96ffd40a43abc7102756d6bb4f 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -11,7 +11,8 @@ GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-k
 
 if [ "$(id -u)" -eq 0 ]; then
        # we could use a tmpfile here too, but creation of this tends to be time-consuming
 
 if [ "$(id -u)" -eq 0 ]; then
        # we could use a tmpfile here too, but creation of this tends to be time-consuming

-       GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
+       eval $(apt-config shell TRUSTDBDIR Dir::Etc/d)
+       GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"

 fi
 
 GPG="$GPG_CMD"
 fi
 
 GPG="$GPG_CMD"