From 9fdf49ef0e7cc9c6182eb1ce337c1cfb454b025f Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Sat, 22 Jun 2024 18:34:15 +0200 Subject: [PATCH] flasher: f-string fixes (MR 2252) Signed-off-by: Caleb Connolly --- pmb/flasher/variables.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pmb/flasher/variables.py b/pmb/flasher/variables.py index ab4cba8b..8dafee8a 100644 --- a/pmb/flasher/variables.py +++ b/pmb/flasher/variables.py @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from typing import Optional import pmb.config.pmaports +from pmb.core.chroot import Chroot from pmb.core.context import get_context from pmb.types import PmbArgs @@ -91,10 +92,10 @@ def variables(args: PmbArgs, flavor: str, method: str): "$PARTITION_VBMETA": _partition_vbmeta, "$PARTITION_DTBO": _partition_dtbo, "$FLASH_PAGESIZE": flash_pagesize, - "$RECOVERY_ZIP": "/mnt/buildroot_" + deviceinfo.arch + + "$RECOVERY_ZIP": f"/mnt/{Chroot.buildroot(deviceinfo.arch)}" "/var/lib/postmarketos-android-recovery-installer" - "/pmos-" + device + ".zip", - "$UUU_SCRIPT": "/mnt/rootfs_" + deviceinfo.codename + + f"/pmos-{device}.zip", + "$UUU_SCRIPT": f"/mnt/{Chroot.rootfs(deviceinfo.codename)}" "/usr/share/uuu/flash_script.lst", "$NO_REBOOT": _no_reboot, "$RESUME": _resume