Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/menu
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2022-05-02 21:01:50 +1000
committerGitHub <noreply@github.com>2022-05-02 13:01:50 +0200
commitf00717ff6fd1c72d61b6928444fbf26a3f5e0e64 (patch)
tree0d37ec0b3f666d0316c7f97dce5c1cf3c81e832f /archinstall/lib/menu
parent48b1001734529c86d09c718d28e32cd6c23958bb (diff)
Fix #1106 (#1119)
* Fix #1106 * flake8 * flake8 Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
Diffstat (limited to 'archinstall/lib/menu')
-rw-r--r--archinstall/lib/menu/global_menu.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/archinstall/lib/menu/global_menu.py b/archinstall/lib/menu/global_menu.py
index afccd45b..63b8c03e 100644
--- a/archinstall/lib/menu/global_menu.py
+++ b/archinstall/lib/menu/global_menu.py
@@ -8,7 +8,6 @@ from ..general import SysCommand, secret
from ..hardware import has_uefi
from ..models import NetworkConfiguration
from ..storage import storage
-from ..output import log
from ..profiles import is_desktop_profile
from ..disk import encrypted_partitions
@@ -277,11 +276,12 @@ class GlobalMenu(GeneralMenu):
if profile and profile.has_prep_function():
namespace = f'{profile.namespace}.py'
with profile.load_instructions(namespace=namespace) as imported:
- if not imported._prep_function():
- log(' * Profile\'s preparation requirements was not fulfilled.', fg='red')
- exit(1)
+ if imported._prep_function():
+ return profile
+ else:
+ return self._select_profile()
- return profile
+ return self._data_store.get('profile', None)
def _create_superuser_account(self):
superusers = ask_for_superuser_account(str(_('Manage superuser accounts: ')))