diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 09:32:51 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-09-07 09:32:51 +0200 |
| commit | 3580e481e0dcbb4a39d687137eafcda60d8e85d5 (patch) | |
| tree | cacd09d1c987a06d6e02581eb8c3afaf1e56ec00 /cmdline | |
| parent | debca0004bc8b57e487a5a8ffdec51b54ae2f22a (diff) | |
| parent | ca07950ec545b41a18cbeff0ec0ba43624592c07 (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'cmdline')
| -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 c5a2103d8..3514effad 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 |