* 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

diff --git a/cmdline/apt-key b/cmdline/apt-key
index 27731ef7d30a4559d7254c41d7aa620382220d6b..b39ab12e48fd0daf57ec369fdf54b2ee4b6bf386 100755 (executable)
--- 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

diff --git a/debian/changelog b/debian/changelog
index 205777a01d8735d1aba7354bb1e4a0c33a894e35..4dca62603eba38ae79bf8228bc2803d464422aa0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,11 @@ apt (0.8.2) UNRELEASED; urgency=low
   * apt-pkg/indexcopy.cc:
     - support really still the APT::GPGV::TrustedKeyring setting,
       as it breaks d-i badly otherwise (Closes: #595428)
+  * 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
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 04 Sep 2010 10:45:45 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 04 Sep 2010 15:25:10 +0200
 
 apt (0.8.1) unstable; urgency=low
 

diff --git a/test/integration/framework b/test/integration/framework
index d832bedbef5010bfdd3b3f23879a8a0d69a573da..8a5973d4bfb917f5b6efeba7187fbbfa60928e1b 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,6 +72,7 @@ aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
+aptkey() { runapt apt-key $*; }
 dpkg() {
        $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
 }