Spelling errors, and filtered the output a bit.

This commit is contained in:
Anton Hvornum 2021-05-11 09:53:18 +02:00
parent dd52bfb3a7
commit 20d9858cf6
2 changed files with 6 additions and 6 deletions

View File

@ -256,7 +256,7 @@ class Partition():
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
output = json.loads(output.decode('UTF-8'))
for partition in output.get('partitionstable', {}).get('partitions', []):
for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path:
return partition['start']# * self.sector_size
@ -265,8 +265,8 @@ class Partition():
# TODO: Verify that the logic holds up, that 'size' is the size without 'start' added to it.
output = b"".join(sys_command(f"sfdisk --json {self.block_device.path}"))
output = json.loads(output.decode('UTF-8'))
for partition in output.get('partitionstable', {}).get('partitions', []):
for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path:
return partition['size']# * self.sector_size
@ -289,7 +289,7 @@ class Partition():
# }
# }
for partition in output.get('partitionstable', {}).get('partitions', []):
for partition in output.get('partitiontable', {}).get('partitions', []):
if partition['node'] == self.path:
return partition.get('bootable', False)

View File

@ -592,7 +592,7 @@ def wipe_and_create_partitions(block_device):
else:
partition_type = 'msdos'
partitions_result = [part.__dump__() for part in block_device.partitions]
partitions_result = [part.__dump__() for part in block_device.partitions.values()]
suggested_layout = [
{ # Boot
"type" : "primary",
@ -641,7 +641,7 @@ def wipe_and_create_partitions(block_device):
if len(partitions_result):
print('Current partition layout:')
for partition in partitions_result:
print(partition)
print({key: val for key, val in partition.items() if val})
print()
task = generic_select(modes,