Skip to content

Commit 878f404

Browse files
committed
Update ModificationStatus members to uppercase
1 parent c0a2de4 commit 878f404

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

archinstall/lib/disk/device_handler.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ def _setup_partition(
508508
) -> None:
509509
# when we require a delete and the partition to be (re)created
510510
# already exists then we have to delete it first
511-
if requires_delete and part_mod.status in [ModificationStatus.Modify, ModificationStatus.Delete]:
511+
if requires_delete and part_mod.status in [ModificationStatus.MODIFY, ModificationStatus.DELETE]:
512512
info(f'Delete existing partition: {part_mod.safe_dev_path}')
513513
part_info = self.find_partition(part_mod.safe_dev_path)
514514

@@ -517,7 +517,7 @@ def _setup_partition(
517517

518518
disk.deletePartition(part_info.partition)
519519

520-
if part_mod.status == ModificationStatus.Delete:
520+
if part_mod.status == ModificationStatus.DELETE:
521521
return
522522

523523
start_sector = part_mod.start.convert(

archinstall/lib/disk/device_model.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,20 +163,20 @@ def parse_arg(cls, disk_config: _DiskLayoutConfigurationSerialization) -> DiskLa
163163
continue
164164

165165
first = non_delete_partitions[0]
166-
if first.status == ModificationStatus.Create and not first.start.is_valid_start():
166+
if first.status == ModificationStatus.CREATE and not first.start.is_valid_start():
167167
raise ValueError('First partition must start at no less than 1 MiB')
168168

169169
for i, current_partition in enumerate(non_delete_partitions[1:], start=1):
170170
previous_partition = non_delete_partitions[i - 1]
171171
if (
172-
current_partition.status == ModificationStatus.Create
172+
current_partition.status == ModificationStatus.CREATE
173173
and current_partition.start < previous_partition.end
174174
):
175175
raise ValueError('Partitions overlap')
176176

177177
create_partitions = [
178178
part_mod for part_mod in non_delete_partitions
179-
if part_mod.status == ModificationStatus.Create
179+
if part_mod.status == ModificationStatus.CREATE
180180
]
181181

182182
if not create_partitions:
@@ -823,10 +823,10 @@ def installation_hooks(self) -> str | None:
823823

824824

825825
class ModificationStatus(Enum):
826-
Exist = 'existing'
827-
Modify = 'modify'
828-
Delete = 'delete'
829-
Create = 'create'
826+
EXIST = 'existing'
827+
MODIFY = 'modify'
828+
DELETE = 'delete'
829+
CREATE = 'create'
830830

831831

832832
class _PartitionModificationSerialization(TypedDict):
@@ -872,7 +872,7 @@ def __post_init__(self) -> None:
872872
if self.is_exists_or_modify() and not self.dev_path:
873873
raise ValueError('If partition marked as existing a path must be set')
874874

875-
if self.fs_type is None and self.status == ModificationStatus.Modify:
875+
if self.fs_type is None and self.status == ModificationStatus.MODIFY:
876876
raise ValueError('FS type must not be empty on modifications with status type modify')
877877

878878
@override
@@ -915,7 +915,7 @@ def from_existing_partition(cls, partition_info: _PartitionInfo) -> PartitionMod
915915
subvol_mods = []
916916

917917
return PartitionModification(
918-
status=ModificationStatus.Exist,
918+
status=ModificationStatus.EXIST,
919919
type=partition_info.type,
920920
start=partition_info.start,
921921
length=partition_info.length,
@@ -970,23 +970,23 @@ def is_home(self) -> bool:
970970
)
971971

972972
def is_modify(self) -> bool:
973-
return self.status == ModificationStatus.Modify
973+
return self.status == ModificationStatus.MODIFY
974974

975975
def is_delete(self) -> bool:
976-
return self.status == ModificationStatus.Delete
976+
return self.status == ModificationStatus.DELETE
977977

978978
def exists(self) -> bool:
979-
return self.status == ModificationStatus.Exist
979+
return self.status == ModificationStatus.EXIST
980980

981981
def is_exists_or_modify(self) -> bool:
982982
return self.status in [
983-
ModificationStatus.Exist,
984-
ModificationStatus.Delete,
985-
ModificationStatus.Modify
983+
ModificationStatus.EXIST,
984+
ModificationStatus.DELETE,
985+
ModificationStatus.MODIFY
986986
]
987987

988988
def is_create_or_modify(self) -> bool:
989-
return self.status in [ModificationStatus.Create, ModificationStatus.Modify]
989+
return self.status in [ModificationStatus.CREATE, ModificationStatus.MODIFY]
990990

991991
@property
992992
def mapper_name(self) -> str | None:

archinstall/lib/disk/partitioning_menu.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def table_data(self) -> dict[str, str]:
6464
return self.segment.table_data()
6565

6666
part_mod = PartitionModification(
67-
status=ModificationStatus.Create,
67+
status=ModificationStatus.CREATE,
6868
type=PartitionType._Unknown,
6969
start=self.segment.start,
7070
length=self.segment.length,
@@ -179,7 +179,7 @@ def _run_actions_on_entry(self, entry: DiskSegment) -> None:
179179
@override
180180
def selected_action_display(self, selection: DiskSegment) -> str:
181181
if isinstance(selection.segment, PartitionModification):
182-
if selection.segment.status == ModificationStatus.Create:
182+
if selection.segment.status == ModificationStatus.CREATE:
183183
return str(_('Partition - New'))
184184
elif selection.segment.is_delete() and selection.segment.dev_path:
185185
title = str(_('Partition')) + '\n\n'
@@ -296,7 +296,7 @@ def _delete_partition(
296296
data: list[DiskSegment]
297297
) -> list[DiskSegment]:
298298
if entry.is_exists_or_modify():
299-
entry.status = ModificationStatus.Delete
299+
entry.status = ModificationStatus.DELETE
300300
part_mods = self.get_part_mods(data)
301301
else:
302302
part_mods = [
@@ -337,12 +337,12 @@ def _set_btrfs_subvolumes(self, partition: PartitionModification) -> None:
337337
).run()
338338

339339
def _prompt_formatting(self, partition: PartitionModification) -> None:
340-
# an existing partition can toggle between Exist or Modify
340+
# an existing partition can toggle between EXIST or MODIFY
341341
if partition.is_modify():
342-
partition.status = ModificationStatus.Exist
342+
partition.status = ModificationStatus.EXIST
343343
return
344344
elif partition.exists():
345-
partition.status = ModificationStatus.Modify
345+
partition.status = ModificationStatus.MODIFY
346346

347347
# If we mark a partition for formatting, but the format is CRYPTO LUKS, there's no point in formatting it really
348348
# without asking the user which inner-filesystem they want to use. Since the flag 'encrypted' = True is already set,
@@ -474,7 +474,7 @@ def _create_new_partition(self, free_space: FreeSpace) -> PartitionModification:
474474
mountpoint = self._prompt_mountpoint()
475475

476476
partition = PartitionModification(
477-
status=ModificationStatus.Create,
477+
status=ModificationStatus.CREATE,
478478
type=PartitionType.Primary,
479479
start=free_space.start,
480480
length=length,

archinstall/lib/interactions/disk_conf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ def _boot_partition(sector_size: disk.SectorSize, using_gpt: bool) -> disk.Parti
224224

225225
# boot partition
226226
return disk.PartitionModification(
227-
status=disk.ModificationStatus.Create,
227+
status=disk.ModificationStatus.CREATE,
228228
type=disk.PartitionType.Primary,
229229
start=start,
230230
length=size,
@@ -393,7 +393,7 @@ def suggest_single_disk_layout(
393393
root_length = available_space - root_start
394394

395395
root_partition = disk.PartitionModification(
396-
status=disk.ModificationStatus.Create,
396+
status=disk.ModificationStatus.CREATE,
397397
type=disk.PartitionType.Primary,
398398
start=root_start,
399399
length=root_length,
@@ -428,7 +428,7 @@ def suggest_single_disk_layout(
428428
flags.append(disk.PartitionFlag.LINUX_HOME)
429429

430430
home_partition = disk.PartitionModification(
431-
status=disk.ModificationStatus.Create,
431+
status=disk.ModificationStatus.CREATE,
432432
type=disk.PartitionType.Primary,
433433
start=home_start,
434434
length=home_length,
@@ -517,7 +517,7 @@ def suggest_multi_disk_layout(
517517

518518
# add root partition to the root device
519519
root_partition = disk.PartitionModification(
520-
status=disk.ModificationStatus.Create,
520+
status=disk.ModificationStatus.CREATE,
521521
type=disk.PartitionType.Primary,
522522
start=root_start,
523523
length=root_length,
@@ -539,7 +539,7 @@ def suggest_multi_disk_layout(
539539

540540
# add home partition to home device
541541
home_partition = disk.PartitionModification(
542-
status=disk.ModificationStatus.Create,
542+
status=disk.ModificationStatus.CREATE,
543543
type=disk.PartitionType.Primary,
544544
start=home_start,
545545
length=home_length,

examples/full_automated_installation.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
# create a new boot partition
2020
boot_partition = disk.PartitionModification(
21-
status=disk.ModificationStatus.Create,
21+
status=disk.ModificationStatus.CREATE,
2222
type=disk.PartitionType.Primary,
2323
start=disk.Size(1, disk.Unit.MiB, device.device_info.sector_size),
2424
length=disk.Size(512, disk.Unit.MiB, device.device_info.sector_size),
@@ -30,7 +30,7 @@
3030

3131
# create a root partition
3232
root_partition = disk.PartitionModification(
33-
status=disk.ModificationStatus.Create,
33+
status=disk.ModificationStatus.CREATE,
3434
type=disk.PartitionType.Primary,
3535
start=disk.Size(513, disk.Unit.MiB, device.device_info.sector_size),
3636
length=disk.Size(20, disk.Unit.GiB, device.device_info.sector_size),
@@ -45,7 +45,7 @@
4545

4646
# create a new home partition
4747
home_partition = disk.PartitionModification(
48-
status=disk.ModificationStatus.Create,
48+
status=disk.ModificationStatus.CREATE,
4949
type=disk.PartitionType.Primary,
5050
start=start_home,
5151
length=length_home,

0 commit comments

Comments
 (0)