diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-01-16 17:32:33 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-01-16 17:32:33 +0100 |
| commit | 248ec5ab008a1dfa5bf441b0d40b6c1859954746 (patch) | |
| tree | c494a1222789586710297ee989e0b0342effcbb8 | |
| parent | 39cc82288036a005226564fadd05ef19ef0037bb (diff) | |
* cmdline/apt-key:
- don't set trustdb-name as non-root so 'list' and 'finger'
can be used without being root (Closes: #393005, #592107)
| -rwxr-xr-x | cmdline/apt-key | 7 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index b39ab12e4..c1e01a776 100755 --- 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 -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="" diff --git a/debian/changelog b/debian/changelog index 5c8adb434..b74508804 100644 --- 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 + * 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 |