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

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.

This commit is contained in:
Anton Hvornum 2021-01-26 10:57:48 +01:00
parent 2885da3f71
commit 30e66e49ec
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
profiles/xorg.py
View File

@ -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):
"""