From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 6 Jun 2012 11:24:13 +0000 (+0200)
Subject: * cmdline/apt-key:
X-Git-Tag: 0.9.6~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/563fd891d80feedefd812aad83844e2189870e2c

* cmdline/apt-key:
  - do not hardcode /etc but use Dir::Etc instead
---

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 97d6e0323..c184e3e75 100755
--- 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
-	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"
diff --git a/debian/changelog b/debian/changelog
index 1547e5d35..432032b1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ apt (0.9.5.2) UNRELEASED; urgency=low
   [ Translation of programs ]
   * Danish by Joe Hansen. Closes: #675605
   * French updated by Christian Perrier
+  
+  [ Sebastian Heinlein ]
+  * cmdline/apt-key:
+    - do not hardcode /etc but use Dir::Etc instead
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 18:25:18 +0200