From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 21 May 2023 15:07:26 +0000 (+0200)
Subject: Make sure we page summaries only once when there's multiple presets
X-Git-Tag: v15~153^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3b4457f6ba64bcea631cdc0b3e59e43ec79892a;p=thirdparty%2Fmkosi.git

Make sure we page summaries only once when there's multiple presets
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index d5bf773e3..7e55974c6 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1190,7 +1190,7 @@ def line_join_source_target_list(array: Sequence[tuple[Path, Optional[Path]]]) -
     return "\n                                ".join(items)
 
 
-def print_summary(args: MkosiArgs, config: MkosiConfig) -> None:
+def summary(args: MkosiArgs, config: MkosiConfig) -> str:
     b = Style.bold
     e = Style.reset
     bold: Callable[..., str] = lambda s: f"{b}{s}{e}"
@@ -1265,7 +1265,7 @@ def print_summary(args: MkosiArgs, config: MkosiConfig) -> None:
                NSpawn Settings: {none_to_none(config.nspawn_settings)}
             Extra search paths: {line_join_list(config.extra_search_paths)}
           QEMU Extra Arguments: {line_join_list(config.qemu_args)}
-        """
+"""
 
     if config.output_format == OutputFormat.disk:
         summary += f"""\
@@ -1279,10 +1279,9 @@ def print_summary(args: MkosiArgs, config: MkosiConfig) -> None:
                       Checksum: {yes_no(config.checksum)}
                           Sign: {yes_no(config.sign)}
                        GPG Key: ({"default" if config.key is None else config.key})
-        """
-
-    page(summary, args.pager)
+"""
 
+    return summary
 
 def make_output_dir(state: MkosiState) -> None:
     """Create the output directory if set and not existing yet"""
@@ -2012,9 +2011,12 @@ def run_verb(args: MkosiArgs, presets: Sequence[MkosiConfig]) -> None:
         return bump_image_version()
 
     if args.verb == Verb.summary:
+        text = ""
+
         for config in presets:
-            print_summary(args, config)
+            text += f"{summary(args, config)}\n"
 
+        page(text, args.pager)
         return
 
     last = presets[-1]