diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-06-11 15:13:24 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-06-11 15:13:24 -0700 |
| commit | 825098c2740b2d5ebea0c16c43685f55da201315 (patch) | |
| tree | b3a43f792cca021a79f541a9454e0223e4dca9cb /cmdline/apt-key | |
| parent | 310ed3c13d5cfd2a3c46741539f652d69bda5d30 (diff) | |
| parent | e08c5854bb9b5f352b0856533f95c12e858728ca (diff) | |
Merge version 0.9.6 from Debian
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 c3d9d9aff..dda3c1b43 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" |