Move two more checks from load_config() to check_inputs()

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 15b5546e47f6144bd6867b1465bb16cc42c83bb3..aa45675d9fc063c0c2233e6d64e4bcef27ef68a6 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2604,6 +2604,12 @@ def check_inputs(config: Config) -> None:
     Make sure all the inputs exist that aren't checked during config parsing because they might
     be created by an earlier build.
     """
+    if config.overlay and not config.base_trees:
+        die("--overlay=yes can only be used with --base-tree=")
+
+    if config.incremental and not config.cache_dir:
+        die("A cache directory must be configured in order to use --incremental=yes")
+
     for base in config.base_trees:
         if not base.exists():
             die(f"Base tree {base} not found")

diff --git a/mkosi/config.py b/mkosi/config.py
index 50b4b1bdcc92933c598f48aec577061bdd3f05e8..b41d67ceda87b744cd261acb5c3e49228500cd30 100644 (file)
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -4768,12 +4768,6 @@ def load_config(config: argparse.Namespace) -> Config:
 
     config.environment = load_environment(config)
 
-    if config.overlay and not config.base_trees:
-        die("--overlay can only be used with --base-tree")
-
-    if config.incremental and not config.cache_dir:
-        die("A cache directory must be configured in order to use --incremental")
-
     return Config.from_namespace(config)