From 5c9bd235d3d0e653ba8d643748fd3d776359978b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sat, 28 May 2022 10:06:22 +0200 Subject: Fixes additional encryption prompt even tho partitions was marked for encryption (#1264) Corrected the check for partitions marked with `encrypt: true` --- archinstall/lib/disk/helpers.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'archinstall/lib/disk/helpers.py') diff --git a/archinstall/lib/disk/helpers.py b/archinstall/lib/disk/helpers.py index 99856aad..65d7a006 100644 --- a/archinstall/lib/disk/helpers.py +++ b/archinstall/lib/disk/helpers.py @@ -433,9 +433,10 @@ def disk_layouts() -> Optional[Dict[str, Any]]: def encrypted_partitions(blockdevices :Dict[str, Any]) -> bool: - for partition in blockdevices.values(): - if partition.get('encrypted', False): - yield partition + for blockdevice in blockdevices.values(): + for partition in blockdevice.get('partitions', []): + if partition.get('encrypted', False): + yield partition def find_partition_by_mountpoint(block_devices :List[BlockDevice], relative_mountpoint :str) -> Partition: for device in block_devices: -- cgit v1.2.3-54-g00ecf