summaryrefslogtreecommitdiff
diff options
authorRobert C Jennings <robert.jennings@canonical.com>2017-05-30 08:59:14 -0500
committerRobert C Jennings <robert.jennings@canonical.com>2017-05-30 08:59:14 -0500
commitb2544cf3955c7d907ce412187bc902910cae9f4a (patch)
tree2f13a0f30a3512207004ae470324a0b3cf1266c3
parentab4bbc9c94f7438494ee7b3d3ea3e38ad5fafa58 (diff)
Use host apt-secure keychains
Prior to this patch the code is not using /etc/apt/trusted.gpg and /etc/apt/trusted.gpg.d/*. It would use the cache.$suite-$arch/etc/apt/trusted.gpg[.d/] in the local dir which has no keys on the keychain. This patch configures apt to use the host's keychain to avoid: apt.cache.FetchFailedException: W:GPG error: \ http://archive.ubuntu.com/ubuntu trusty-updates \ InRelease: The following signatures couldn't be verified \ because the public key is not available: NO_PUBKEY 40976EAF437D05B5 \ NO_PUBKEY 3B4FE6ACC0B21F32 bzr-revno: 18.1.9
-rwxr-xr-xmfdiff2
1 files changed, 2 insertions, 0 deletions
diff --git a/mfdiff b/mfdiff
index 61bb5b6..6143822 100755
--- a/mfdiff
+++ b/mfdiff
@@ -238,6 +238,8 @@ def main():
prep_cacheroot(cache_d, release)
apt.apt_pkg.config.set("Apt::Architecture", arch)
+ apt.apt_pkg.config.set("Dir::Etc::Trusted", "/etc/apt/trusted.gpg")
+ apt.apt_pkg.config.set("Dir::Etc::TrustedParts", "/etc/apt/trusted.gpg.d/")
cache = None
errors = []