diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2012-12-26 23:52:47 +0100 |
| commit | d2cca6ec46865a1f5167f846e67150dc19ca2022 (patch) | |
| tree | 43d335f69870a72b97fa41a1b208784b8753d354 /cmdline/apt-key | |
| parent | 7735ad0500b6fefef03b2a3dc2a6843e82353e94 (diff) | |
| parent | d663a4c8a8723ae4936d10d0a98ea2c05a29cbc4 (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 97d6e0323..c184e3e75 100755 --- 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 - 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" |