diff options
| author | Stefan Lippers-Hollmann <s.L-H@gmx.de> | 2011-02-08 22:26:15 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-02-08 22:26:15 +0100 |
| commit | d4e80f1f0f75ef0409ba702c7ef866fbf437b8cb (patch) | |
| tree | fc85f51175fb60699c5477af20bc90297433d3dc | |
| parent | 24f634e951df86f41ae1838f2acd99f6657a3c84 (diff) | |
[ 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
| -rwxr-xr-x | cmdline/apt-key | 2 | ||||
| -rw-r--r-- | debian/changelog | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index c1e01a776..3838fafcd 100755 --- 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 51f55c98a..6081841f4 100644 --- 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 ] |