From: Jörg Behrmann <behrmann@physik.fu-berlin.de>
Date: Sat, 21 Sep 2024 10:57:38 +0000 (+0200)
Subject: Reduce indentation in finalize_qemu_firmware
X-Git-Tag: v25~275^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=547afcd83576b5a76dd73be9c259f59ace65a4fa;p=thirdparty%2Fmkosi.git

Reduce indentation in finalize_qemu_firmware
---

diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 3e8fa7610..e7975b831 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -642,27 +642,28 @@ def generate_scratch_fs(config: Config) -> Iterator[Path]:
 
 
 def finalize_qemu_firmware(config: Config, kernel: Optional[Path]) -> QemuFirmware:
-    if config.qemu_firmware == QemuFirmware.auto:
-        if kernel:
-            return (
-                QemuFirmware.uefi_secure_boot
-                if KernelType.identify(config, kernel) != KernelType.unknown
-                else QemuFirmware.linux
-            )
-        elif (
-            config.output_format in (OutputFormat.cpio, OutputFormat.directory)
-            or config.architecture.to_efi() is None
-        ):
-            return QemuFirmware.linux
-        else:
-            # At the moment there are no qemu firmware descriptions for non-x86 architectures that advertise
-            # secure-boot support so let's default to no secure boot for non-x86 architectures.
-            return (
-                QemuFirmware.uefi_secure_boot if config.architecture.is_x86_variant() else QemuFirmware.uefi
-            )
-    else:
+    if config.qemu_firmware != QemuFirmware.auto:
         return config.qemu_firmware
 
+    if kernel:
+        if KernelType.identify(config, kernel) != KernelType.unknown:
+            return QemuFirmware.uefi_secure_boot
+
+        return QemuFirmware.linux
+
+    if (
+        config.output_format in (OutputFormat.cpio, OutputFormat.directory)
+        or config.architecture.to_efi() is None
+    ):
+        return QemuFirmware.linux
+
+    # At the moment there are no qemu firmware descriptions for non-x86 architectures that advertise
+    # secure-boot support so let's default to no secure boot for non-x86 architectures.
+    if config.architecture.is_x86_variant():
+        return QemuFirmware.uefi_secure_boot
+
+    return QemuFirmware.uefi
+
 
 def finalize_firmware_variables(
     config: Config,