From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 10 Jul 2024 06:39:47 +0000 (+0200)
Subject: Don't require extra trees and initrds to exist if Format=none
X-Git-Tag: v24~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1929b1ad9609a33236a026dcaf565e9f0920ebec;p=thirdparty%2Fmkosi.git

Don't require extra trees and initrds to exist if Format=none

We don't use these if Format=none so let's not check if they exist.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 2ba97a922..ec09a9634 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2803,9 +2803,15 @@ def check_inputs(config: Config) -> None:
     if config.tools_tree and not config.tools_tree.exists():
         die(f"Tools tree {config.tools_tree} not found")
 
-    for name, trees in (("skeleton", config.skeleton_trees),
-                        ("package manager", config.package_manager_trees),
-                        ("extra", config.extra_trees)):
+    trees = [
+        ("skeleton", config.skeleton_trees),
+        ("package manager", config.package_manager_trees),
+    ]
+
+    if config.output_format != OutputFormat.none:
+        trees += [("extra", config.extra_trees)]
+
+    for name, trees in trees:
         for tree in trees:
             if not tree.source.exists():
                 die(f"{name.capitalize()} tree {tree.source} not found")
@@ -2813,7 +2819,7 @@ def check_inputs(config: Config) -> None:
             if tree.source.is_file() and tree.source.suffix == ".raw" and not tree.target and os.getuid() != 0:
                 die(f"Must run as root to use disk images in {name} trees")
 
-    if config.bootable != ConfigFeature.disabled:
+    if config.output_format != OutputFormat.none and config.bootable != ConfigFeature.disabled:
         for p in config.initrds:
             if not p.exists():
                 die(f"Initrd {p} not found")