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

Merge PR #732 - Fixed #718 

Swapped .get() statement for a verification om Partition().uuid
This commit is contained in:
Anton Hvornum 2021-11-18 13:46:28 +00:00 committed by GitHub
parent d2a4572e98 b3d4155114
commit bd48a6918f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/disk/partition.py
View File

@ -153,7 +153,8 @@ class Partition:
partuuid_struct = SysCommand(f'lsblk -J -o+PARTUUID {self.path}') partuuid_struct = SysCommand(f'lsblk -J -o+PARTUUID {self.path}')
if partuuid_struct.exit_code == 0: if partuuid_struct.exit_code == 0:
if partition_information := next(iter(json.loads(partuuid_struct.decode('UTF-8'))['blockdevices']), None): if partition_information := next(iter(json.loads(partuuid_struct.decode('UTF-8'))['blockdevices']), None):
return partition_information.get('partuuid', None) if (partuuid := partition_information.get('partuuid', None)):
return partuuid
time.sleep(storage['DISK_TIMEOUTS']) time.sleep(storage['DISK_TIMEOUTS'])