| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/lib/installer.py | 6 | ||||
| -rw-r--r-- | archinstall/lib/user_interaction.py | 5 |
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py index 04fe44c8..577a2ae1 100644 --- a/archinstall/lib/installer.py +++ b/archinstall/lib/installer.py @@ -90,14 +90,14 @@ class Installer(): self.genfstab() if not (missing_steps := self.post_install_check()): - self.log('Installation completed without any errors. You may now reboot.', bg='black', fg='green', level=logging.INFO) + self.log('Installation completed without any errors. You may now reboot.', fg='green', level=logging.INFO) self.sync_log_to_install_medium() return True else: - self.log('Some required steps were not successfully installed/configured before leaving the installer:', bg='black', fg='red', level=logging.WARNING) + self.log('Some required steps were not successfully installed/configured before leaving the installer:', fg='red', level=logging.WARNING) for step in missing_steps: - self.log(f' - {step}', bg='black', fg='red', level=logging.WARNING) + self.log(f' - {step}', fg='red', level=logging.WARNING) self.log(f"Detailed error logs can be found at: {storage['LOG_PATH']}", level=logging.WARNING) self.log(f"Submit this zip file as an issue to https://github.com/archlinux/archinstall/issues", level=logging.WARNING) diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py index 5cfb0a1b..cd848136 100644 --- a/archinstall/lib/user_interaction.py +++ b/archinstall/lib/user_interaction.py @@ -289,7 +289,7 @@ def generic_select(options, input_text="Select one of the above by index or abso print(f"{index}: {option}") # The new changes introduce a single while loop for all inputs processed by this function - # Now the try...except...else block handles validation for invalid input from the user + # Now the try...except block handles validation for invalid input from the user while True: try: selected_option = input(input_text) @@ -305,6 +305,7 @@ def generic_select(options, input_text="Select one of the above by index or abso if selected_option >= len(options): raise RequirementError(f'Selected option "{selected_option}" is out of range') selected_option = options[selected_option] + break elif selected_option in options: break # We gave a correct absolute value else: @@ -312,8 +313,6 @@ def generic_select(options, input_text="Select one of the above by index or abso except RequirementError as err: log(f" * {err} * ", fg='red') continue - else: - break return selected_option |