From 8f51e167e4cfd87edb1fb73188430c0b4f5729f0 Mon Sep 17 00:00:00 2001 From: Joerg Behrmann Date: Fri, 20 Oct 2023 16:32:44 +0200 Subject: [PATCH] Fix ruff warnings --- mkosi/__init__.py | 6 +++--- mkosi/config.py | 4 +++- mkosi/qemu.py | 9 +++++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index dc5e29a0c..38698010a 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -19,7 +19,7 @@ import textwrap import uuid from collections.abc import Iterator, Mapping, Sequence from pathlib import Path -from typing import ContextManager, Optional, TextIO, Union +from typing import Optional, TextIO, Union from mkosi.archive import extract_tar, make_cpio, make_tar from mkosi.config import ( @@ -350,12 +350,12 @@ def finalize_scripts(scripts: Mapping[str, Sequence[PathString]] = {}) -> Iterat yield Path(d) -def finalize_host_scripts(state: MkosiState, chroot: Sequence[PathString]) -> ContextManager[Path]: +def finalize_host_scripts(state: MkosiState, chroot: Sequence[PathString]) -> contextlib.AbstractContextManager[Path]: git = {"git": ("git", "-c", "safe.directory=*")} if find_binary("git") else {} return finalize_scripts(git | {"mkosi-chroot": chroot} | package_manager_scripts(state)) -def finalize_chroot_scripts(state: MkosiState) -> ContextManager[Path]: +def finalize_chroot_scripts(state: MkosiState) -> contextlib.AbstractContextManager[Path]: git = {"git": ("git", "-c", "safe.directory=*")} if find_binary("git", state.root) else {} return finalize_scripts(git) diff --git a/mkosi/config.py b/mkosi/config.py index 87718fb1e..5bbb49663 100644 --- a/mkosi/config.py +++ b/mkosi/config.py @@ -2108,7 +2108,9 @@ def parse_config(argv: Sequence[str] = ()) -> tuple[MkosiArgs, tuple[MkosiConfig continue if (v := finalize_default(s, namespace, defaults)) is None: - logging.warning(f"Setting {s.name} specified by specifier '%{c}' in {text} is not yet set, ignoring") + logging.warning( + f"Setting {s.name} specified by specifier '%{c}' in {text} is not yet set, ignoring" + ) continue result += str(v) diff --git a/mkosi/qemu.py b/mkosi/qemu.py index a109b610a..19ac314cd 100644 --- a/mkosi/qemu.py +++ b/mkosi/qemu.py @@ -379,7 +379,9 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu kernel = None if config.output_format == OutputFormat.uki and kernel: - logging.warning(f"Booting UKI output, kernel {kernel} configured with QemuKernel= or passed with -kernel will not be used") + logging.warning( + f"Booting UKI output, kernel {kernel} configured with QemuKernel= or passed with -kernel will not be used" + ) kernel = None if kernel and not kernel.exists(): @@ -388,7 +390,10 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig, qemu_device_fds: Mapping[Qemu if config.qemu_firmware == QemuFirmware.auto: if kernel: firmware = QemuFirmware.uefi if KernelType.identify(kernel) != KernelType.unknown else QemuFirmware.linux - elif config.output_format in (OutputFormat.cpio, OutputFormat.directory) or config.architecture.to_efi() is None: + elif ( + config.output_format in (OutputFormat.cpio, OutputFormat.directory) or + config.architecture.to_efi() is None + ): firmware = QemuFirmware.linux else: firmware = QemuFirmware.uefi -- 2.47.2