diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-04 15:28:47 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-09-04 15:28:47 +0200 |
| commit | 1f8b2599f6beb14e8855f5d43fc1a759a08690e9 (patch) | |
| tree | 8dd90c6fb898f9af8cd56e9d43b6f86352247d2e /cmdline | |
| parent | 1dc03a8614454023ab8ed265465c061980cb9ea9 (diff) | |
* cmdline/apt-key:
- support also Dir::Etc::Trusted so that apt-key works in the same
way as the library part which works with the trusted files
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 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 |