]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Set the preset field before we parse the preset's config
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Sun, 22 Oct 2023 13:24:38 +0000 (15:24 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 23 Oct 2023 08:37:20 +0000 (10:37 +0200)
In case we ever want to add a match setting for the current preset.

mkosi/config.py

index a330d8bd4c8031a9691db35cb46ac2972602f7a1..ba4ba371f2256d69b480a0525eb52efacc1e2a78 100644 (file)
@@ -2368,11 +2368,12 @@ def parse_config(argv: Sequence[str] = ()) -> tuple[MkosiArgs, tuple[MkosiConfig
                 ns_copy = copy.deepcopy(namespace)
                 defaults_copy = copy.deepcopy(defaults)
 
+                setattr(ns_copy, "preset", name)
+
                 with chdir(p if p.is_dir() else Path.cwd()):
                     if not parse_config(p if p.is_file() else Path("."), ns_copy, defaults_copy):
                         continue
 
-                setattr(ns_copy, "preset", name)
                 finalize_defaults(ns_copy, defaults_copy)
                 presets += [ns_copy]