From 5178fa54c1a8aec53d2d3f10553e08be1813009f Mon Sep 17 00:00:00 2001 From: CooperWang0912 Date: Tue, 28 Jul 2026 13:53:23 +0800 Subject: [PATCH] Avoid None Return --- archinstall/lib/configuration.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/configuration.py b/archinstall/lib/configuration.py index f96486b0..39d0fa98 100644 --- a/archinstall/lib/configuration.py +++ b/archinstall/lib/configuration.py @@ -8,10 +8,15 @@ from archinstall.lib.translationhandler import tr from archinstall.tui.menu_item import MenuItem, MenuItemGroup from archinstall.tui.result import ResultType -async def confirm_ufw(config: ArchConfig) -> None: +async def confirm_ufw(config: ArchConfig) -> bool: firewall_config = config.app_config.firewall_config is_ufw = firewall_config and firewall_config.firewall and firewall_config.firewall.value == 'ufw' - if is_ufw and "openssh" in config.packages: + has_openssh = "openssh" in config.packages + + if not (is_ufw and has_openssh): + return True + + else: header = f'{tr("You have both ufw and OpenSSH in your packages")}. ' header += tr('Would you like to allow incoming SSH connections through the firewall?') + '\n' group = MenuItemGroup.yes_no() @@ -23,9 +28,11 @@ async def confirm_ufw(config: ArchConfig) -> None: preset=True, ).show() - if result: + if result and result.get_value(): config.custom_commands.append("ufw allow OpenSSH") + return True + async def confirm_config(config: ArchConfig) -> bool: header = f'{tr("The specified configuration will be applied")}. ' header += tr('Would you like to continue?') + '\n'