]> git.saurik.com Git - apt.git/commitdiff
* cmdline/apt-key:
authorJulian Andres Klode <jak@debian.org>
Sun, 21 Mar 2010 16:58:58 +0000 (17:58 +0100)
committerJulian Andres Klode <jak@debian.org>
Sun, 21 Mar 2010 16:58:58 +0000 (17:58 +0100)
  - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)

cmdline/apt-key
debian/changelog

index e45468fd4a1bddaf6407cab9bf4bd4a8fbb71e47..27731ef7d30a4559d7254c41d7aa620382220d6b 100755 (executable)
@@ -146,6 +146,7 @@ if [ "$1" = "--keyring" ]; then
 else
        #echo "generate list"
        TRUSTEDFILE="/etc/apt/trusted.gpg"
+       eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
        if [ -r "$TRUSTEDFILE" ]; then
                GPG="$GPG --keyring $TRUSTEDFILE"
        fi
index c53c2a4686b15a8f0c4b48128623e4aa150c4540..cc5b03a6314b712c850793f11250762f530ffcdf 100644 (file)
@@ -9,6 +9,8 @@ apt (0.7.26~exp3) UNRELEASED; urgency=low
     that package that was providing some manpages for APT utilities.
 
   [ Julian Andres Klode ]
+  * cmdline/apt-key:
+    - Honor Apt::GPGV::TrustedKeyring (Closes: #316390)
   * cmdline/apt-mark:
     - Use the new python-apt API (and conflict with python-apt << 0.7.93.2).
   * apt-inst/contrib/arfile.h: