From a1f49deb94d10dd3129f1672d2b222cf9d7e2a87 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Fri, 3 Apr 2026 15:55:10 -0400 Subject: [PATCH] Remove is_subpath() and use Path.is_relative_to() --- archinstall/lib/disk/device_handler.py | 3 +-- archinstall/lib/utils/util.py | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py index 2cf91bf8e8..c3c678db0f 100644 --- a/archinstall/lib/disk/device_handler.py +++ b/archinstall/lib/disk/device_handler.py @@ -36,7 +36,6 @@ ) from archinstall.lib.models.users import Password from archinstall.lib.output import debug, error, info, log -from archinstall.lib.utils.util import is_subpath class DeviceHandler: @@ -563,7 +562,7 @@ def detect_pre_mounted_mods(self, base_mountpoint: Path) -> list[DeviceModificat for device in self.devices: for part_info in device.partition_infos: for mountpoint in part_info.mountpoints: - if is_subpath(mountpoint, base_mountpoint): + if mountpoint.is_relative_to(base_mountpoint): path = Path(part_info.disk.device.path) part_mods.setdefault(path, []) part_mod = PartitionModification.from_existing_partition(part_info) diff --git a/archinstall/lib/utils/util.py b/archinstall/lib/utils/util.py index d75bcaa794..7db7e8214a 100644 --- a/archinstall/lib/utils/util.py +++ b/archinstall/lib/utils/util.py @@ -20,17 +20,6 @@ def generate_password(length: int = 64) -> str: return ''.join(secrets.choice(haystack) for _ in range(length)) -def is_subpath(first: Path, second: Path) -> bool: - """ - Check if _first_ a subpath of _second_ - """ - try: - first.relative_to(second) - return True - except ValueError: - return False - - def format_cols(items: list[str], header: str | None = None) -> str: if header: text = f'{header}:\n'