From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 27 Oct 2022 13:13:31 +0000 (+0200)
Subject: mkosi: put various script-related status lines together
X-Git-Tag: v15~401^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1246%2Fhead;p=thirdparty%2Fmkosi.git

mkosi: put various script-related status lines together

For some reason the build script was described quite far from the
other scripts. Since 19a989fdafe3b50b7c6629efa64e6e4b1fa0c31a the same
environment is used for all scripts, so the "Script Environment" line
is now under all scripts, since it applies to all of them.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index b52268111..bf4efdd97 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -7026,17 +7026,6 @@ def print_summary(config: MkosiConfig) -> None:
     if config.remove_packages:
         print("           Remove Packages:", line_join_list(config.remove_packages))
 
-    print("              Build Script:", path_or_none(config.build_script, check_script_input))
-
-    env = [f"{k}={v}" for k, v in config.environment.items()]
-    print("        Script Environment:", line_join_list(env))
-
-    if config.build_script:
-        print("                 Run tests:", yes_no(config.with_tests))
-
-    print("                  Password:", ("default" if config.password is None else "set"))
-    print("                 Autologin:", yes_no(config.autologin))
-
     print("             Build Sources:", none_to_none(config.build_sources))
     print("      Source File Transfer:", none_to_none(config.source_file_transfer))
     print("Source File Transfer Final:", none_to_none(config.source_file_transfer_final))
@@ -7045,12 +7034,24 @@ def print_summary(config: MkosiConfig) -> None:
     print("         Install Directory:", none_to_none(config.install_dir))
     print("            Build Packages:", line_join_list(config.build_packages))
     print("          Skip final phase:", yes_no(config.skip_final_phase))
+
+    print("              Build Script:", path_or_none(config.build_script, check_script_input))
+
+    env = [f"{k}={v}" for k, v in config.environment.items()]
+    if config.build_script:
+        print("                 Run tests:", yes_no(config.with_tests))
+
     print("        Postinstall Script:", path_or_none(config.postinst_script, check_script_input))
     print("            Prepare Script:", path_or_none(config.prepare_script, check_script_input))
     print("           Finalize Script:", path_or_none(config.finalize_script, check_script_input))
+
+    print("        Script Environment:", line_join_list(env))
     print("      Scripts with network:", yes_no_or(config.with_network))
     print("           nspawn Settings:", none_to_none(config.nspawn_settings))
 
+    print("                  Password:", ("default" if config.password is None else "set"))
+    print("                 Autologin:", yes_no(config.autologin))
+
     if config.output_format.is_disk():
         print("\nPARTITIONS:")