From a45bd248c7d8a1940975b714fbe4f5ae4244ae67 Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Sun, 8 Sep 2024 17:28:09 -0400 Subject: [PATCH] Convert lsblk mountpoint str to Path object (#2676) --- archinstall/lib/disk/device_model.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index 0eb40de0..6869b668 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -1345,7 +1345,7 @@ class LsblkInfo: 'fsavail': self.fsavail, 'fsuse_percentage': self.fsuse_percentage, 'type': self.type, - 'mountpoint': self.mountpoint, + 'mountpoint': str(self.mountpoint) if self.mountpoint else None, 'mountpoints': [str(m) for m in self.mountpoints], 'fsroots': [str(r) for r in self.fsroots], 'children': [c.json() for c in self.children] @@ -1393,6 +1393,8 @@ class LsblkInfo: lsblk_info.children = [LsblkInfo.from_json(child) for child in blockdevice.get('children', [])] + lsblk_info.mountpoint = Path(lsblk_info.mountpoint) if lsblk_info.mountpoint else None + # sometimes lsblk returns 'mountpoints': [null] lsblk_info.mountpoints = [Path(mnt) for mnt in lsblk_info.mountpoints if mnt]