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

pmb.config.pmaports: don't add to args (MR 1912)

Browse source 
Do not make the parsed pmaports.cfg from pmaports.git available as
args.pmaports anymore. This de-bloats the args variable a bit.

First I thought that we didn't even need to cache it, but it was pointed
out that later patches do access it frequently to read the current channel
from pmaports.cfg. Therefore it is using a cache now.

Related: #1879, #1855
This commit is contained in:
Oliver Smith 2020-04-09 21:22:17 +02:00
parent b015273d86
commit fc5cb2e190
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pmb/helpers/args.py
View file

@ -63,7 +63,6 @@ import pmb.helpers.git
Examples:
args.deviceinfo (e.g. {"name": "Mydevice", "arch": "armhf", ...})
args.pmaports (e.g. {"version": "1", "branch_alpine": "edge", ...})
"""
@ -133,7 +132,8 @@ def add_cache(args):
"pmb.helpers.package.depends_recurse": {},
"pmb.helpers.package.get": {},
"pmb.helpers.repo.update": repo_update,
"pmb.helpers.git.parse_channels_cfg": {}})
"pmb.helpers.git.parse_channels_cfg": {},
"pmb.config.pmaports.read_config": None})
def add_deviceinfo(args):
@ -162,7 +162,7 @@ def init(args):
check_pmaports_path(args)
if args.action not in ["init", "config", "bootimg_analyze", "log",
"pull", "shutdown", "zap"]:
pmb.config.pmaports.read_config_into_args(args)
pmb.config.pmaports.read_config(args)
add_deviceinfo(args)
pmb.helpers.git.parse_channels_cfg(args)