* cmdline/apt-key:

  - do not hardcode /etc but use Dir::Etc instead

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"

diff --git a/debian/changelog b/debian/changelog
index 1547e5d35738378aafdf0fe45ea1e93233370474..432032b1ea0b472763a9b388fe06968968eae9e6 100644 (file)
--- 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
   [ 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
 
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 02 Jun 2012 18:25:18 +0200