From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 9 Feb 2024 11:21:22 +0000 (+0100)
Subject: Resolve dependencies before calling load_config()
X-Git-Tag: v21~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6cc48c767ab3acc8d89a42eacb3eaca8402018c2;p=thirdparty%2Fmkosi.git

Resolve dependencies before calling load_config()

Let's not call load_config() for images that we're going to discard
immediately after.

Fixes #2348
---

diff --git a/mkosi/config.py b/mkosi/config.py
index dc8dc409a..4f9ed5dbb 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -2784,7 +2784,7 @@ def create_argument_parser(action: type[argparse.Action]) -> argparse.ArgumentPa
     return parser
 
 
-def resolve_deps(images: Sequence[Config], include: Sequence[str]) -> list[Config]:
+def resolve_deps(images: Sequence[argparse.Namespace], include: Sequence[str]) -> list[argparse.Namespace]:
     graph = {config.image: config.dependencies for config in images}
 
     if include:
@@ -3197,8 +3197,8 @@ def parse_config(argv: Sequence[str] = (), *, resources: Path = Path("/")) -> tu
     if not images:
         die("No images defined in mkosi.images/")
 
-    images = [load_config(args, ns) for ns in images]
     images = resolve_deps(images, include)
+    images = [load_config(args, ns) for ns in images]
 
     return args, tuple(images)