Actually prevent installing if the config is invalid (#3335)
This also makes use of the previously unused _is_config_valid() method.
This commit is contained in:
parent
0f90d5991d
commit
e6b0ebb5f3
|
|
@ -1,6 +1,6 @@
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING, override
|
||||||
|
|
||||||
from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
|
from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
|
||||||
from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
|
from archinstall.lib.disk.encryption_menu import DiskEncryptionMenu
|
||||||
|
|
@ -245,6 +245,7 @@ class GlobalMenu(AbstractMenu):
|
||||||
|
|
||||||
return list(missing)
|
return list(missing)
|
||||||
|
|
||||||
|
@override
|
||||||
def _is_config_valid(self) -> bool:
|
def _is_config_valid(self) -> bool:
|
||||||
"""
|
"""
|
||||||
Checks the validity of the current configuration.
|
Checks the validity of the current configuration.
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,9 @@ class AbstractMenu:
|
||||||
for item in self._menu_item_group.items:
|
for item in self._menu_item_group.items:
|
||||||
item.enabled = False
|
item.enabled = False
|
||||||
|
|
||||||
|
def _is_config_valid(self) -> bool:
|
||||||
|
return True
|
||||||
|
|
||||||
def run(self) -> Any | None:
|
def run(self) -> Any | None:
|
||||||
self._sync_from_config()
|
self._sync_from_config()
|
||||||
|
|
||||||
|
|
@ -108,6 +111,8 @@ class AbstractMenu:
|
||||||
item: MenuItem = result.item()
|
item: MenuItem = result.item()
|
||||||
|
|
||||||
if item.action is None:
|
if item.action is None:
|
||||||
|
if not self._is_config_valid():
|
||||||
|
continue
|
||||||
break
|
break
|
||||||
case ResultType.Reset:
|
case ResultType.Reset:
|
||||||
return None
|
return None
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue