Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds+github@gmail.com>2020-10-18 13:20:58 +0200
committerAnton Hvornum <anton.feeds+github@gmail.com>2020-10-18 13:20:58 +0200
commit9c5d1e98916d41c3a8cb951dcec08217cddefbed (patch)
treec36e45ce8e84f233ccb0ada91bf37839e46dac11
parent0e8130af9a2f18603d9bc8a4331f7d67a56b1b9f (diff)
Added error handling to guided.py when not selecting a profile to install.
-rw-r--r--archinstall/lib/user_interaction.py8
-rw-r--r--examples/guided.py2
2 files changed, 4 insertions, 6 deletions
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index e01859b3..0d3a12f5 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -81,11 +81,9 @@ def select_profile(options):
print(' -- (Leave blank to skip this next optional step) --')
selected_profile = input('Any particular pre-programmed profile you want to install: ')
- #print(' -- You can enter ? or help to search for more profiles --')
- #if selected_profile.lower() in ('?', 'help'):
- # filter_string = input('Search for layout containing (example: "sv-"): ')
- # new_options = search_keyboard_layout(filter_string)
- # return select_language(new_options)
+ if len(selected_profile.strip()) <= 0:
+ return None
+
if selected_profile.isdigit() and (pos := int(selected_profile)) <= len(profiles)-1:
selected_profile = profiles[pos]
elif selected_profile in options:
diff --git a/examples/guided.py b/examples/guided.py
index 83eeabe3..03874ada 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -24,7 +24,7 @@ def perform_installation(device, boot_partition, language, mirrors):
if len(packages) and packages[0] != '':
installation.add_additional_packages(packages)
- if len(profile.strip()):
+ if profile and len(profile.strip()):
installation.install_profile(profile)
for user, password in users.items():