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

Removed debug information

This commit is contained in:
Anton Hvornum 2022-05-27 20:40:43 +02:00
parent 03c1944dae
commit da8043ede9
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/disk/filesystem.py
View File

@ -84,15 +84,12 @@ class Filesystem:
for partition in layout.get('partitions', []): for partition in layout.get('partitions', []):
# We don't want to re-add an existing partition (those containing a UUID already) # We don't want to re-add an existing partition (those containing a UUID already)
if partition.get('wipe', False) and not partition.get('PARTUUID', None): if partition.get('wipe', False) and not partition.get('PARTUUID', None):
print(_("Adding partition...."))
start = partition.get('start') or ( start = partition.get('start') or (
prev_partition and f'{prev_partition["device_instance"].end_sectors}s' or DEFAULT_PARTITION_START) prev_partition and f'{prev_partition["device_instance"].end_sectors}s' or DEFAULT_PARTITION_START)
partition['device_instance'] = self.add_partition(partition.get('type', 'primary'), partition['device_instance'] = self.add_partition(partition.get('type', 'primary'),
start=start, start=start,
end=partition.get('size', '100%'), end=partition.get('size', '100%'),
partition_format=partition.get('filesystem', {}).get('format', 'btrfs')) partition_format=partition.get('filesystem', {}).get('format', 'btrfs'))
# TODO: device_instance some times become None
# print('Device instance:', partition['device_instance'])
elif (partition_uuid := partition.get('PARTUUID')): elif (partition_uuid := partition.get('PARTUUID')):
# We try to deal with both UUID and PARTUUID of a partition when it's being re-used. # We try to deal with both UUID and PARTUUID of a partition when it's being re-used.
@ -107,7 +104,6 @@ class Filesystem:
else: else:
log(f"{self}.load_layout() doesn't know how to work without 'wipe' being set or UUID ({partition.get('PARTUUID')}) was given and found.", fg="yellow", level=logging.WARNING) log(f"{self}.load_layout() doesn't know how to work without 'wipe' being set or UUID ({partition.get('PARTUUID')}) was given and found.", fg="yellow", level=logging.WARNING)
continue continue
# raise ValueError(f"{self}.load_layout() doesn't know how to continue without a new partition definition or a UUID ({partition.get('PARTUUID')}) on the device ({self.blockdevice.get_partition(uuid=partition.get('PARTUUID'))}).")
if partition.get('filesystem', {}).get('format', False): if partition.get('filesystem', {}).get('format', False):
@ -148,7 +144,7 @@ class Filesystem:
while True: while True:
partition['filesystem']['format'] = input(f"Enter a valid fs-type for newly encrypted partition {partition['filesystem']['format']}: ").strip() partition['filesystem']['format'] = input(f"Enter a valid fs-type for newly encrypted partition {partition['filesystem']['format']}: ").strip()
if not partition['filesystem']['format'] or valid_fs_type(partition['filesystem']['format']) is False: if not partition['filesystem']['format'] or valid_fs_type(partition['filesystem']['format']) is False:
print(_("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's.")) log(_("You need to enter a valid fs-type in order to continue. See `man parted` for valid fs-type's."))
continue continue
break break
@ -259,8 +255,6 @@ class Filesystem:
new_partuuid_set = (set(previous_partuuids) ^ set(new_partition_uuids)) new_partuuid_set = (set(previous_partuuids) ^ set(new_partition_uuids))
print(previous_partuuids, new_partition_uuids, new_partuuid_set)
if len(new_partuuid_set) and (new_partuuid := new_partuuid_set.pop()): if len(new_partuuid_set) and (new_partuuid := new_partuuid_set.pop()):
try: try:
return self.blockdevice.get_partition(partuuid=new_partuuid) return self.blockdevice.get_partition(partuuid=new_partuuid)