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

flasher: variables: rename vars to fvars (MR 2252)

Browse source 
vars is a reserved keyword in python, use fvars instead.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-08 00:18:15 +02:00 • committed by Oliver Smith
parent 852ace63c4
commit b51d31acab
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/flasher/variables.py
View file

@ -78,7 +78,7 @@ def variables(args: PmbArgs, flavor, method):
if getattr(args,'resume', False):
_resume = "--resume"
vars = {
fvars = {
"$BOOT": "/mnt/rootfs_" + device + "/boot",
"$DTB": _dtb,
"$IMAGE_SPLIT_BOOT": "/home/pmos/rootfs/" + device + "-boot.img",
@ -104,8 +104,8 @@ def variables(args: PmbArgs, flavor, method):
# Backwards compatibility with old mkinitfs (pma#660)
pmaports_cfg = pmb.config.pmaports.read_config()
if pmaports_cfg.get("supported_mkinitfs_without_flavors", False):
vars["$FLAVOR"] = ""
fvars["$FLAVOR"] = ""
else:
vars["$FLAVOR"] = f"-{flavor}" if flavor is not None else "-"
fvars["$FLAVOR"] = f"-{flavor}" if flavor is not None else "-"
return vars
return fvars