From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Sat, 9 Dec 2023 11:17:32 +0000 (+0100)
Subject: fix ruff warnings
X-Git-Tag: v20~96^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f413eace703c2c85bc53d0ebc0e277bc2d1485f7;p=thirdparty%2Fmkosi.git

fix ruff warnings
---

diff --git a/mkosi/kmod.py b/mkosi/kmod.py
index 742238884..0844d39d4 100644
--- a/mkosi/kmod.py
+++ b/mkosi/kmod.py
@@ -12,7 +12,7 @@ from mkosi.run import bwrap, chroot_cmd
 
 
 def loaded_modules() -> list[str]:
-    return [l.split()[0] for l in Path("/proc/modules").read_text().splitlines()]
+    return [line.split()[0] for line in Path("/proc/modules").read_text().splitlines()]
 
 
 def filter_kernel_modules(
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 512d709d1..53d2f4218 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -625,7 +625,9 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu
                  fname])
             stack.callback(lambda: fname.unlink())
         elif config.ephemeral and config.output_format not in (OutputFormat.cpio, OutputFormat.uki):
-            fname = stack.enter_context(copy_ephemeral(config, config.output_dir_or_cwd() / config.output_with_compression))
+            fname = stack.enter_context(
+                copy_ephemeral(config, config.output_dir_or_cwd() / config.output_with_compression)
+            )
         else:
             fname = config.output_dir_or_cwd() / config.output_with_compression
 
@@ -763,7 +765,10 @@ def run_ssh(args: MkosiArgs, config: MkosiConfig) -> None:
     if config.qemu_vsock_cid == QemuVsockCID.auto:
         die("Can't use ssh verb with QemuVSockCID=auto")
 
-    cid = hash_to_vsock_cid(hash_output(config)) if config.qemu_vsock_cid == QemuVsockCID.hash else config.qemu_vsock_cid
+    if config.qemu_vsock_cid == QemuVsockCID.hash:
+        cid = hash_to_vsock_cid(hash_output(config))
+    else:
+        cid = config.qemu_vsock_cid
 
     cmd = [
         "ssh",
diff --git a/tests/test_boot.py b/tests/test_boot.py
index 15bc2a601..378a8fa0e 100644
--- a/tests/test_boot.py
+++ b/tests/test_boot.py
@@ -38,7 +38,10 @@ def test_boot(format: OutputFormat) -> None:
             args = ["systemd.mask=systemd-resolved.service"] if format == OutputFormat.directory else []
             image.boot(options=options, args=args)
 
-        if image.distribution == Distribution.ubuntu and format in (OutputFormat.cpio, OutputFormat.uki, OutputFormat.esp):
+        if (
+            image.distribution == Distribution.ubuntu and
+            format in (OutputFormat.cpio, OutputFormat.uki, OutputFormat.esp)
+        ):
             # https://bugs.launchpad.net/ubuntu/+source/linux-kvm/+bug/2045561
             pytest.skip("Cannot boot Ubuntu UKI/cpio images in qemu until we switch back to linux-kvm")
 
diff --git a/tests/test_initrd.py b/tests/test_initrd.py
index 683b139ab..fd34149e1 100644
--- a/tests/test_initrd.py
+++ b/tests/test_initrd.py
@@ -189,7 +189,17 @@ def test_initrd_luks_lvm(initrd: Image, passphrase: Path) -> None:
         lodev = run(["losetup", "--show", "--find", "--partscan", drive], stdout=subprocess.PIPE).stdout.strip()
         stack.callback(lambda: run(["losetup", "--detach", lodev]))
         run(["sfdisk", "--label", "gpt", lodev], input="type=E6D6D379-F507-44C2-A23C-238F2A3DF928 bootable")
-        run(["cryptsetup", "--key-file", passphrase, "--use-random", "--pbkdf", "pbkdf2", "--pbkdf-force-iterations", "1000", "luksFormat", f"{lodev}p1"])
+        run(
+            [
+                "cryptsetup",
+                "--key-file", passphrase,
+                "--use-random",
+                "--pbkdf", "pbkdf2",
+                "--pbkdf-force-iterations", "1000",
+                "luksFormat",
+                f"{lodev}p1",
+            ]
+        )
         run(["cryptsetup", "--key-file", passphrase, "luksOpen", f"{lodev}p1", "lvm_root"])
         stack.callback(lambda: run(["cryptsetup", "close", "lvm_root"]))
         luks_uuid = run(["cryptsetup", "luksUUID", f"{lodev}p1"], stdout=subprocess.PIPE).stdout.strip()