particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/mpp: create PkgInfo class for package info

Browse source 
Instead of passing dictionaries around that are inconvenient to
use in code and even more in the `mpp-format-*` directives, use
a simple class to represent package information. Use that in
the `pkginfo` dict that can be accessed via `mpp-format-*`. Use
the `evra` property instead of string manipulation in the
`fedora-boot.mpp.json` and `-ostree-bootiso.mpp.json` manifest.
This commit is contained in:
Christian Kellner 2021-07-01 15:40:08 +00:00
parent d5c5947271
commit d47f735112
3 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/data/manifests/fedora-boot.mpp.json
View file

@ -71,7 +71,7 @@
"kernel_opts": "ro biosdevname=0 net.ifnames=0",
"legacy": "i386-pc",
"saved_entry": {
"mpp-format-string": "{'f'*32}-{rpms['stages']['kernel-core'][12:]}"
"mpp-format-string": "{'f'*32}-{rpms['stages']['kernel-core'].evra}"
}
}
},

4
test/data/manifests/fedora-ostree-bootiso.mpp.json
View file

@ -341,7 +341,7 @@
"type": "org.osbuild.dracut",
"options": {
"kernel": [
{"mpp-format-string": "{rpms['ostree-tree']['kernel'][7:-4]}" }
{"mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" }
],
"add_modules": [
"anaconda",
@ -455,7 +455,7 @@
"version": "34"
},
"isolabel": "Fedora-34-X86_64",
"kernel": {"mpp-format-string": "{rpms['ostree-tree']['kernel'][7:-4]}" },
"kernel": {"mpp-format-string": "{rpms['ostree-tree']['kernel'].evra}" },
"efi": {
"architectures": [
"IA32",