From cd587792e1e8f429f2dcd3c8e9f745d80cb28f38 Mon Sep 17 00:00:00 2001 From: Daniel Girtler Date: Tue, 16 Apr 2024 22:06:03 +1000 Subject: Fix master merge conflicts from LVM branch (#2463) --- archinstall/lib/disk/device_model.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index 50de3ebc..7edaa5b6 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -1429,8 +1429,7 @@ def _clean_field(name: str, clean_type: CleanType) -> str: def _fetch_lsblk_info( dev_path: Optional[Union[Path, str]] = None, reverse: bool = False, - full_dev_path: bool = False, - retry: int = 3 + full_dev_path: bool = False ) -> List[LsblkInfo]: fields = [_clean_field(f, CleanType.Lsblk) for f in LsblkInfo.fields()] cmd = ['lsblk', '--json', '--bytes', '--output', '+' + ','.join(fields)] -- cgit v1.2.3-70-g09d2