[ Stefan Lippers-Hollmann ]

* cmdline/apt-key:
  - fix root test which prevented setting of trustdb-name
    which lets gpg fail if it adds/remove keys from trusted.gpg
    as it tries to open the (maybe) not existent /root/.gnupg

diff --git a/cmdline/apt-key b/cmdline/apt-key
index c1e01a776827556d03da54eafb1f095e0b3497e3..3838fafcd61b18f7957f6423975ac2f65153eaed 100755 (executable)
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -7,7 +7,7 @@ unset GREP_OPTIONS
 # implodes if there isn't one available
 GPG_CMD='gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg'
 
-if ! id -u > /dev/null; then
+if [ "$(id -u)" -eq 0 ]; then
        GPG_CMD="$GPG_CMD --trustdb-name /etc/apt/trustdb.gpg"
 fi
 

diff --git a/debian/changelog b/debian/changelog
index 51f55c98a16114c140e6363e5d16b8cd85eaa304..6081841f48e3318931ef69fab7493fe5f813fcc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.8.11.1) unstable; urgency=low
+
+  [ Stefan Lippers-Hollmann ]
+  * cmdline/apt-key:
+    - fix root test which prevented setting of trustdb-name
+      which lets gpg fail if it adds/remove keys from trusted.gpg
+      as it tries to open the (maybe) not existent /root/.gnupg
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 08 Feb 2011 22:22:33 +0100
+
 apt (0.8.11) unstable; urgency=low
 
   [ David Kalnischkies ]