From 30e66e49ecde503bf0706a363a41d4cbff174f4a Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Tue, 26 Jan 2021 10:57:48 +0100 Subject: Fixes #86 by properly raising the the correct exceptions. This will happen when required steps are skipped. And the error message is to simply restart the installer. --- profiles/xorg.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'profiles') diff --git a/profiles/xorg.py b/profiles/xorg.py index a5820268..1282b8a5 100644 --- a/profiles/xorg.py +++ b/profiles/xorg.py @@ -59,8 +59,10 @@ def select_driver(options): selected_driver = options[drivers[pos]] elif selected_driver in options: selected_driver = options[options.index(selected_driver)] + elif len(selected_driver) == 0: + raise archinstall.RequirementError("At least one graphics driver is needed to support a graphical environment. Please restart the installer and try again.") else: - RequirementError("Selected driver does not exist.") + raise archinstall.RequirementError("Selected driver does not exist.") if type(selected_driver) == dict: driver_options = sorted(list(selected_driver)) @@ -72,14 +74,16 @@ def select_driver(options): selected_driver_package_group = selected_driver[driver_options[pos]] elif selected_driver_package_group in selected_driver: selected_driver_package_group = selected_driver[selected_driver.index(selected_driver_package_group)] + elif len(selected_driver_package_group) == 0: + raise archinstall.RequirementError(f"At least one driver package is required for a graphical environment using {selected_driver}. Please restart the installer and try again.") else: - RequirementError(f"Selected driver-type does not exist for {initial_option}.") + raise archinstall.RequirementError(f"Selected driver-type does not exist for {initial_option}.") return selected_driver_package_group return selected_driver - raise RequirementError("Selecting drivers require a least one profile to be given as an option.") + raise archinstall.RequirementError("Selecting drivers require a least one profile to be given as an option.") def _prep_function(*args, **kwargs): """ -- cgit v1.2.3-54-g00ecf