install: tweak flash information output (MR 1991)

This adds generic advice when no flashing method is configured and
remove deprecated angle brackets.

Closes: #1948
This commit is contained in:
Johannes Marbach 2020-11-18 19:57:21 +01:00 committed by Oliver Smith
parent ed2175546c
commit 751524b5b4
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 11 additions and 3 deletions

View File

@ -518,8 +518,6 @@ def print_flash_info(args):
""" Print flashing information, based on the deviceinfo data and the
pmbootstrap arguments. """
logging.info("*** FLASHING INFORMATION ***")
logging.info("Run the following to flash your installation to the"
" target device:")
# System flash information
method = args.deviceinfo["flash_method"]
@ -527,6 +525,16 @@ def print_flash_info(args):
flasher_actions = flasher.get("actions", {})
requires_split = flasher.get("split", False)
if method == "none":
logging.info("Refer to the installation instructions of your device,"
" or the generic install instructions in the wiki.")
logging.info("https://wiki.postmarketos.org/wiki/Installation_guide"
"#pmbootstrap_flash")
return
logging.info("Run the following to flash your installation to the"
" target device:")
if "flash_rootfs" in flasher_actions and not args.sdcard and \
bool(args.split) == requires_split:
logging.info("* pmbootstrap flasher flash_rootfs")
@ -584,7 +592,7 @@ def install_recovery_zip(args, steps):
# Flash information
logging.info("*** FLASHING INFORMATION ***")
logging.info("Flashing with the recovery zip is explained here:")
logging.info("<https://postmarketos.org/recoveryzip>")
logging.info("https://postmarketos.org/recoveryzip")
def install_on_device_installer(args, step, steps):