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

Fix MapperDev.subvolumes (#1249) 

* Fixed a silent try/except, and MapperDev.subvolumes should now work.

* MapperDev.subvolumes now properly sends a pathlib.Path.
This commit is contained in:
Anton Hvornum 2022-05-26 19:53:24 +02:00 committed by GitHub
parent e19ef44630
commit 353c05318c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/disk/btrfs/btrfs_helpers.py
View File

@ -112,8 +112,8 @@ def subvolume_info_from_path(path :pathlib.Path) -> Optional[BtrfsSubvolume]:
return BtrfsSubvolume(**{'full_path' : path, 'name' : subvolume_name, **result}) return BtrfsSubvolume(**{'full_path' : path, 'name' : subvolume_name, **result})
except SysCallError: except SysCallError as error:
pass log(f"Could not retrieve subvolume information from {path}: {error}", level=logging.WARNING, fg="orange")
return None return None

7
archinstall/lib/disk/mapperdev.py
View File

@ -77,7 +77,8 @@ class MapperDev:
@property @property
def subvolumes(self) -> Iterator['BtrfsSubvolume']: def subvolumes(self) -> Iterator['BtrfsSubvolume']:
from .btrfs import subvolume_info_from_path from .btrfs import subvolume_info_from_path
for mountpoint in self.mount_information: for mountpoint in self.mount_information:
if subvolume := subvolume_info_from_path(mountpoint): if target := mountpoint.get('target'):
yield subvolume if subvolume := subvolume_info_from_path(pathlib.Path(target)):
yield subvolume