From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 19 Mar 2025 10:26:00 +0000 (+0100)
Subject: mkosi/config: show deprecated *Exlude options only if set
X-Git-Tag: v26~311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b99fb11123290a3339ad53e8d8ce727cdb52d1;p=thirdparty%2Fmkosi.git

mkosi/config: show deprecated *Exlude options only if set

Those settings were deprecated in the docs, so only show them
in the Summary output if they are set to make them less prominent.
---

diff --git a/mkosi/config.py b/mkosi/config.py
index 71a6774e2..8a80e9783 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -5129,14 +5129,34 @@ def summary(config: Config) -> str:
                              Splash: {none_to_none(config.splash)}
                 Kernel Command Line: {line_join_list(config.kernel_command_line)}
                      Kernel Modules: {line_join_list(config.kernel_modules_include)}
+"""
+
+    if config.kernel_modules_exclude:
+        summary += f"""\
              Kernel Modules Exclude: {line_join_list(config.kernel_modules_exclude)}
+"""
+
+    summary += f"""\
         Kernel Modules Include Host: {yes_no(config.kernel_modules_include_host)}
                      Firmware Files: {line_join_list(config.firmware_include)}
+"""
+
+    if config.firmware_exclude:
+        summary += f"""\
              Firmware Files Exclude: {line_join_list(config.firmware_exclude)}
+"""
 
+    summary += f"""\
               Kernel Modules Initrd: {yes_no(config.kernel_modules_initrd)}
               Kernel Initrd Modules: {line_join_list(config.kernel_modules_initrd_include)}
+"""
+
+    if config.kernel_modules_initrd_exclude:
+        summary += f"""\
       Kernel Modules Initrd Exclude: {line_join_list(config.kernel_modules_initrd_exclude)}
+"""
+
+    summary += f"""\
  Kernel Modules Initrd Include Host: {yes_no(config.kernel_modules_initrd_include_host)}
 
                              Locale: {none_to_default(config.locale)}