From 353c05318ce80b8eec32031c9e14b8471b458548 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Thu, 26 May 2022 19:53:24 +0200 Subject: Fix MapperDev.subvolumes (#1249) * Fixed a silent try/except, and MapperDev.subvolumes should now work. * MapperDev.subvolumes now properly sends a pathlib.Path. --- archinstall/lib/disk/btrfs/btrfs_helpers.py | 4 ++-- archinstall/lib/disk/mapperdev.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'archinstall/lib') diff --git a/archinstall/lib/disk/btrfs/btrfs_helpers.py b/archinstall/lib/disk/btrfs/btrfs_helpers.py index d529478f..d577d82b 100644 --- a/archinstall/lib/disk/btrfs/btrfs_helpers.py +++ b/archinstall/lib/disk/btrfs/btrfs_helpers.py @@ -112,8 +112,8 @@ def subvolume_info_from_path(path :pathlib.Path) -> Optional[BtrfsSubvolume]: return BtrfsSubvolume(**{'full_path' : path, 'name' : subvolume_name, **result}) - except SysCallError: - pass + except SysCallError as error: + log(f"Could not retrieve subvolume information from {path}: {error}", level=logging.WARNING, fg="orange") return None diff --git a/archinstall/lib/disk/mapperdev.py b/archinstall/lib/disk/mapperdev.py index 67230012..913dbc13 100644 --- a/archinstall/lib/disk/mapperdev.py +++ b/archinstall/lib/disk/mapperdev.py @@ -77,7 +77,8 @@ class MapperDev: @property def subvolumes(self) -> Iterator['BtrfsSubvolume']: from .btrfs import subvolume_info_from_path - + for mountpoint in self.mount_information: - if subvolume := subvolume_info_from_path(mountpoint): - yield subvolume \ No newline at end of file + if target := mountpoint.get('target'): + if subvolume := subvolume_info_from_path(pathlib.Path(target)): + yield subvolume \ No newline at end of file -- cgit v1.2.3-70-g09d2