From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 2 Oct 2024 11:15:45 +0000 (+0200)
Subject: Enable repository key fetch for non-default ubuntu tools trees as well
X-Git-Tag: v25~245^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b4917ad51ae7e917f2ed3f0958926cdc2154fa5;p=thirdparty%2Fmkosi.git

Enable repository key fetch for non-default ubuntu tools trees as well

If we're building an rpm based distribution.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 010c3047f..667cfe0d0 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -808,7 +808,10 @@ def config_default_repository_key_fetch(namespace: argparse.Namespace) -> bool:
         return cast(bool, namespace.distribution.is_rpm_distribution())
 
     if namespace.tools_tree != Path("default"):
-        return False
+        return (
+            detect_distribution(namespace.tools_tree)[0] == Distribution.ubuntu
+            and namespace.distribution.is_rpm_distribution()
+        )
 
     return cast(
         bool,
diff --git a/mkosi/resources/man/mkosi.1.md b/mkosi/resources/man/mkosi.1.md
index f131f77a3..15eff4688 100644
--- a/mkosi/resources/man/mkosi.1.md
+++ b/mkosi/resources/man/mkosi.1.md
@@ -483,10 +483,10 @@ boolean argument: either `1`, `yes`, or `true` to enable, or `0`, `no`,
 
 `RepositoryKeyFetch=`, `--repository-key-fetch=`
 :   Controls whether mkosi will fetch distribution GPG keys remotely. Enabled by
-    default on Ubuntu when not using a tools tree, disabled by default on all
-    other distributions. When disabled, the distribution GPG keys for the target distribution
-    have to be installed locally on the host system alongside the package manager for
-    that distribution.
+    default on Ubuntu when not using a tools tree or when using Ubuntu tools trees to build
+    rpm based distributions. Disabled by default on all other distributions. When disabled,
+    the distribution GPG keys for the target distribution have to be installed locally on the
+    host system alongside the package manager for that distribution.
 
     This setting is only implemented for distributions using dnf or zypper as their
     package manager. For other distributions the distribution GPG keys are always looked