diff options
| author | Michael Vogt <mvo@debian.org> | 2010-09-06 18:11:49 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2010-09-06 18:11:49 +0200 |
| commit | fb031c5598c529b98477c47eac6fe11cae4b1b66 (patch) | |
| tree | de7908c98e8086a148c423e6edb3d8a6e7455491 /cmdline/apt-key | |
| parent | eb1115ef4e84b90189a50c15af4002e4e7306c01 (diff) | |
| parent | 7753e4684e2b80abbed296b90f47be12b4fce8fc (diff) | |
merged from lp:~donkult/apt/sid
Diffstat (limited to 'cmdline/apt-key')
| -rwxr-xr-x | cmdline/apt-key | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmdline/apt-key b/cmdline/apt-key index 27731ef7d..b39ab12e4 100755 --- a/cmdline/apt-key +++ b/cmdline/apt-key @@ -147,11 +147,13 @@ else #echo "generate list" TRUSTEDFILE="/etc/apt/trusted.gpg" eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring) + eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f) if [ -r "$TRUSTEDFILE" ]; then GPG="$GPG --keyring $TRUSTEDFILE" fi GPG="$GPG --primary-keyring $TRUSTEDFILE" TRUSTEDPARTS="/etc/apt/trusted.gpg.d" + eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d) if [ -d "$TRUSTEDPARTS" ]; then #echo "parts active" for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do |