From: Davide Cavalca <dcavalca@fb.com>
Date: Thu, 1 Sep 2016 18:15:14 +0000 (-0700)
Subject: Use local gpg key if available
X-Git-Tag: v1~24^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F12%2Fhead;p=thirdparty%2Fmkosi.git

Use local gpg key if available
---

diff --git a/mkosi b/mkosi
index c29c815fd..3872610b0 100755
--- a/mkosi
+++ b/mkosi
@@ -394,6 +394,12 @@ def enable_networkd(workspace):
 def install_fedora(args, workspace, run_build_script):
     print_step("Installing Fedora...")
 
+    gpg_key = "/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-%s-x86_64" % args.release
+    if os.path.exists(gpg_key):
+        gpg_key = "file://%s" % gpg_key
+    else:
+        gpg_key = "https://getfedora.org/static/81B46521.txt"
+
     with open(os.path.join(workspace, "dnf.conf"), "w") as f:
         f.write("[main]\n")
         f.write("gpgcheck=1\n")
@@ -401,12 +407,12 @@ def install_fedora(args, workspace, run_build_script):
         f.write("[fedora]\n")
         f.write("name=Fedora %s - base\n" % args.release)
         f.write("baseurl=%s/releases/%s/Everything/x86_64/os/\n" % (args.mirror, args.release))
-        f.write("gpgkey=https://getfedora.org/static/81B46521.txt\n")
+        f.write("gpgkey=%s\n" % gpg_key)
         f.write("\n")
         f.write("[updates]\n")
         f.write("name=Fedora %s - updates\n" % args.release)
         f.write("baseurl=%s/updates/%s/x86_64/\n" % (args.mirror, args.release))
-        f.write("gpgkey=https://getfedora.org/static/81B46521.txt\n")
+        f.write("gpgkey=%s\n" % gpg_key)
 
     cmdline = ["dnf",
                "-y",