diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 15:36:54 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-10-13 15:36:54 +0200 |
| commit | 61153c284c832a0d0f7faecd9ad96f6cd9591c64 (patch) | |
| tree | a60d61b723bbc90b8b715a476c5f1ee5e8d6e0c2 /cmdline/apt-key | |
| parent | 940ff5d6b5634b57c2e622b5295f499a7807f3de (diff) | |
| parent | 6bea738672fb503d2813ae2d998096015a81c4a2 (diff) | |
merged from debian-sid branch
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 |