Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

config: init: args.keymap -> config.keymap (MR 2332)

Browse source 
Note by Oliver: this patch also removes the args argument from
ask_for_username.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-23 20:44:07 +02:00 • committed by Oliver Smith
parent 0c932c273d
commit 84332cdce0
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pmb/config/init.py
View file

@ -45,7 +45,7 @@ def require_programs():
) )
def ask_for_username(args: PmbArgs, default_user: str): def ask_for_username(default_user: str):
"""Ask for a reasonable username for the non-root user. """Ask for a reasonable username for the non-root user.
:returns: the username :returns: the username
@ -235,16 +235,16 @@ def ask_for_systemd(config: Config, ui):
return answer return answer
def ask_for_keymaps(args: PmbArgs, deviceinfo: Deviceinfo): def ask_for_keymaps(config: Config, deviceinfo: Deviceinfo):
if not deviceinfo.keymaps or deviceinfo.keymaps.strip() == "": if not deviceinfo.keymaps or deviceinfo.keymaps.strip() == "":
return "" return ""
options = deviceinfo.keymaps.split(" ") options = deviceinfo.keymaps.split(" ")
logging.info(f"Available keymaps for device ({len(options)}): " f"{', '.join(options)}") logging.info(f"Available keymaps for device ({len(options)}): " f"{', '.join(options)}")
if args.keymap == "": if config.keymap == "":
args.keymap = options[0] config.keymap = options[0]
while True: while True:
ret = pmb.helpers.cli.ask("Keymap", None, args.keymap, True, complete=options) ret = pmb.helpers.cli.ask("Keymap", None, config.keymap, True, complete=options)
if ret in options: if ret in options:
return ret return ret
logging.fatal("ERROR: Invalid keymap specified, please type in" " one from the list above.") logging.fatal("ERROR: Invalid keymap specified, please type in" " one from the list above.")
@ -711,9 +711,9 @@ def frontend(args: PmbArgs):
# Device keymap # Device keymap
if device_exists: if device_exists:
config.keymap = ask_for_keymaps(args, deviceinfo) config.keymap = ask_for_keymaps(config, deviceinfo)
config.user = ask_for_username(args, config.user) config.user = ask_for_username(config.user)
ask_for_provider_select_pkg("postmarketos-base", config.providers) ask_for_provider_select_pkg("postmarketos-base", config.providers)
ask_for_provider_select_pkg("postmarketos-base-ui", config.providers) ask_for_provider_select_pkg("postmarketos-base-ui", config.providers)