From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 12 Jan 2024 14:23:44 +0000 (+0100)
Subject: Simplify run_prepare_scripts()
X-Git-Tag: v20.2~23^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=239869ae9df5c2f1fc554366a208901339bddd90;p=thirdparty%2Fmkosi.git

Simplify run_prepare_scripts()

Make it look more like the other script functions.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 6912fb7a8..3ec276f17 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -411,18 +411,18 @@ def run_prepare_scripts(context: Context, build: bool) -> None:
         WITH_TESTS=one_zero(context.config.with_tests),
     )
 
-    with contextlib.ExitStack() as stack:
+    with (
+        mount_build_overlay(context) if build else contextlib.nullcontext(),
+        finalize_chroot_scripts(context) as cd,
+        finalize_ephemeral_source_mounts(context.config) as sources,
+    ):
         if build:
-            stack.enter_context(mount_build_overlay(context))
             step_msg = "Running prepare script {} in build overlay…"
             arg = "build"
         else:
             step_msg = "Running prepare script {}…"
             arg = "final"
 
-        sources = stack.enter_context(finalize_ephemeral_source_mounts(context.config))
-        cd = stack.enter_context(finalize_chroot_scripts(context))
-
         for script in context.config.prepare_scripts:
             chroot = chroot_cmd(
                 context.root,
@@ -439,9 +439,10 @@ def run_prepare_scripts(context: Context, build: bool) -> None:
                 "mkosi-as-caller" : MKOSI_AS_CALLER,
             }
 
-            hd = stack.enter_context(finalize_host_scripts(context, helpers))
-
-            with complete_step(step_msg.format(script)):
+            with (
+                finalize_host_scripts(context, helpers) as hd,
+                complete_step(step_msg.format(script)),
+            ):
                 run(
                     ["/work/prepare", arg],
                     env=env | context.config.environment,