* cmdline/apt-key:

  - don't set trustdb-name as non-root so 'list' and 'finger'
    can be used without being root (Closes: #393005, #592107)

diff --git a/cmdline/apt-key b/cmdline/apt-key
index b39ab12e48fd0daf57ec369fdf54b2ee4b6bf386..c1e01a776827556d03da54eafb1f095e0b3497e3 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -5,7 +5,12 @@ unset GREP_OPTIONS
 
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available
 
 # We don't use a secret keyring, of course, but gpg panics and
 # implodes if there isn't one available

-GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
+GPG_CMD='gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg'
+
+if ! id -u > /dev/null; then
+       GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
+fi
+

 GPG="$GPG_CMD"
 
 MASTER_KEYRING=""
 GPG="$GPG_CMD"
 
 MASTER_KEYRING=""

diff --git a/debian/changelog b/debian/changelog
index 5c8adb4343df3b0d6ec1f50d5d77f40a58f123e5..b74508804d2346d81ff7930c4775d8232828bf27 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -53,8 +53,11 @@ apt (0.8.11+wheezy) unstable; urgency=low
     - operate optional on gzip compressed pdiffs
   * apt-pkg/acquire-item.cc:
     - don't uncompress downloaded pdiff files before feeding it to rred
     - operate optional on gzip compressed pdiffs
   * apt-pkg/acquire-item.cc:
     - don't uncompress downloaded pdiff files before feeding it to rred

+  * cmdline/apt-key:
+    - don't set trustdb-name as non-root so 'list' and 'finger'
+      can be used without being root (Closes: #393005, #592107)

 
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 15 Jan 2011 20:24:03 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sun, 16 Jan 2011 17:23:28 +0100

 
 apt (0.8.10) unstable; urgency=low
 
 
 apt (0.8.10) unstable; urgency=low