Fix recursive call in scripts (#3586)

This commit is contained in:
Daniel Girtler 2025-06-12 03:38:28 +10:00 committed by GitHub
parent a91a922ef4
commit 7b3b7c9ebf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 3 deletions

View File

@ -182,10 +182,14 @@ def guided() -> None:
exit(0) exit(0)
if not arch_config_handler.args.silent: if not arch_config_handler.args.silent:
aborted = False
with Tui(): with Tui():
if not config.confirm_config(): if not config.confirm_config():
debug('Installation aborted') debug('Installation aborted')
guided() aborted = True
if aborted:
return guided()
if arch_config_handler.config.disk_config: if arch_config_handler.config.disk_config:
fs_handler = FilesystemHandler(arch_config_handler.config.disk_config) fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)

View File

@ -71,10 +71,14 @@ def _minimal() -> None:
exit(0) exit(0)
if not arch_config_handler.args.silent: if not arch_config_handler.args.silent:
aborted = False
with Tui(): with Tui():
if not config.confirm_config(): if not config.confirm_config():
debug('Installation aborted') debug('Installation aborted')
_minimal() aborted = True
if aborted:
return _minimal()
if arch_config_handler.config.disk_config: if arch_config_handler.config.disk_config:
fs_handler = FilesystemHandler(arch_config_handler.config.disk_config) fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)

View File

@ -68,10 +68,14 @@ def _only_hd() -> None:
exit(0) exit(0)
if not arch_config_handler.args.silent: if not arch_config_handler.args.silent:
aborted = False
with Tui(): with Tui():
if not config.confirm_config(): if not config.confirm_config():
debug('Installation aborted') debug('Installation aborted')
_only_hd() aborted = True
if aborted:
return _only_hd()
if arch_config_handler.config.disk_config: if arch_config_handler.config.disk_config:
fs_handler = FilesystemHandler(arch_config_handler.config.disk_config) fs_handler = FilesystemHandler(arch_config_handler.config.disk_config)