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

Fixed an import of not yet loaded module

This commit is contained in:
Anton Hvornum 2022-03-28 16:04:24 +02:00
parent 6c71f42b47
commit de80fdc153
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archinstall/lib/user_interaction/partitioning_conf.py
View File

@ -2,7 +2,6 @@ from __future__ import annotations
from typing import List, Any, Dict, Union, TYPE_CHECKING, Callable from typing import List, Any, Dict, Union, TYPE_CHECKING, Callable
from ..disk import BlockDevice, suggest_single_disk_layout, suggest_multi_disk_layout, valid_parted_position
from ..menu import Menu from ..menu import Menu
from ..output import log from ..output import log
@ -10,6 +9,7 @@ from ..disk.validators import fs_types
from .subvolume_config import SubvolumeList from .subvolume_config import SubvolumeList
if TYPE_CHECKING: if TYPE_CHECKING:
from ..disk import BlockDevice
from ..disk.partition import Partition from ..disk.partition import Partition
_: Any _: Any
@ -92,8 +92,9 @@ def select_partition(title :str, partitions :List[Partition], multiple :bool = F
return None return None
def get_default_partition_layout(block_devices: Union[BlockDevice, List[BlockDevice]], def get_default_partition_layout(block_devices: Union['BlockDevice', List['BlockDevice']],
advanced_options: bool = False) -> Dict[str, Any]: advanced_options: bool = False) -> Dict[str, Any]:
from ..disk import suggest_single_disk_layout, suggest_multi_disk_layout
if len(block_devices) == 1: if len(block_devices) == 1:
return suggest_single_disk_layout(block_devices[0], advanced_options=advanced_options) return suggest_single_disk_layout(block_devices[0], advanced_options=advanced_options)
@ -112,7 +113,7 @@ def select_individual_blockdevice_usage(block_devices: list) -> Dict[str, Any]:
return result return result
def manage_new_and_existing_partitions(block_device: BlockDevice) -> Dict[str, Any]: def manage_new_and_existing_partitions(block_device: 'BlockDevice') -> Dict[str, Any]:
block_device_struct = {"partitions": [partition.__dump__() for partition in block_device.partitions.values()]} block_device_struct = {"partitions": [partition.__dump__() for partition in block_device.partitions.values()]}
# Test code: [part.__dump__() for part in block_device.partitions.values()] # Test code: [part.__dump__() for part in block_device.partitions.values()]
# TODO: Squeeze in BTRFS subvolumes here # TODO: Squeeze in BTRFS subvolumes here
@ -155,6 +156,8 @@ def manage_new_and_existing_partitions(block_device: BlockDevice) -> Dict[str, A
break break
if task == new_partition: if task == new_partition:
from ..disk import valid_parted_position
# if partition_type == 'gpt': # if partition_type == 'gpt':
# # https://www.gnu.org/software/parted/manual/html_node/mkpart.html # # https://www.gnu.org/software/parted/manual/html_node/mkpart.html
# # https://www.gnu.org/software/parted/manual/html_node/mklabel.html # # https://www.gnu.org/software/parted/manual/html_node/mklabel.html
@ -200,6 +203,8 @@ def manage_new_and_existing_partitions(block_device: BlockDevice) -> Dict[str, A
fg="red") fg="red")
continue continue
elif task == suggest_partition_layout: elif task == suggest_partition_layout:
from ..disk import suggest_single_disk_layout
if len(block_device_struct["partitions"]): if len(block_device_struct["partitions"]):
prompt = _('{} contains queued partitions, this will remove those, are you sure?').format(block_device) prompt = _('{} contains queued partitions, this will remove those, are you sure?').format(block_device)
choice = Menu(prompt, ['yes', 'no'], default_option='no').run() choice = Menu(prompt, ['yes', 'no'], default_option='no').run()