From 2529d6a5f59eb6a16f95bf9d1117a6033c527df9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 22 Apr 2022 21:23:38 +1000 Subject: Fix blockdevice key error (#1079) Co-authored-by: Daniel Girtler --- archinstall/lib/disk/helpers.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'archinstall/lib/disk/helpers.py') diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index eae618fb..30c47666 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -221,10 +221,8 @@ def all_blockdevices(mappers=False, partitions=False, error=False) -> Dict[str, device_path = f"/dev/{pathlib.Path(block_device).readlink().name}" try: information = blkid(f'blkid -p -o export {device_path}') - - # TODO: No idea why F841 is raised here: - except SysCallError as error: # noqa: F841 - if error.exit_code in (512, 2): + except SysCallError as ex: + if ex.exit_code in (512, 2): # Assume that it's a loop device, and try to get info on it try: information = get_loop_info(device_path) @@ -234,7 +232,7 @@ def all_blockdevices(mappers=False, partitions=False, error=False) -> Dict[str, except SysCallError: information = get_blockdevice_uevent(pathlib.Path(block_device).readlink().name) else: - raise error + raise ex information = enrich_blockdevice_information(information) -- cgit v1.2.3-54-g00ecf