RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove is_subpath() and use Path.is_relative_to() (#4372)

This commit is contained in:
codefiles 2026-04-06 02:42:45 -04:00 committed by GitHub
parent 56bec01979
commit e2bd7b3405
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/disk/device_handler.py
View File

@ -36,7 +36,6 @@ from archinstall.lib.models.device import (
) )
from archinstall.lib.models.users import Password from archinstall.lib.models.users import Password
from archinstall.lib.output import debug, error, info, log from archinstall.lib.output import debug, error, info, log
from archinstall.lib.utils.util import is_subpath
class DeviceHandler: class DeviceHandler:
@ -563,7 +562,7 @@ class DeviceHandler:
for device in self.devices: for device in self.devices:
for part_info in device.partition_infos: for part_info in device.partition_infos:
for mountpoint in part_info.mountpoints: 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) path = Path(part_info.disk.device.path)
part_mods.setdefault(path, []) part_mods.setdefault(path, [])
part_mod = PartitionModification.from_existing_partition(part_info) part_mod = PartitionModification.from_existing_partition(part_info)

11
archinstall/lib/utils/util.py
View File

@ -20,17 +20,6 @@ def generate_password(length: int = 64) -> str:
return ''.join(secrets.choice(haystack) for _ in range(length)) 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: def format_cols(items: list[str], header: str | None = None) -> str:
if header: if header:
text = f'{header}:\n' text = f'{header}:\n'