parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

flavours/cli: clean up json. (add architectures, flatten flavour_info, etc.)

Browse source
This commit is contained in:
InsanePrawn 2023-01-07 17:47:18 +01:00
parent 78874a15e6
commit af1d8d1737
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
flavours/cli.py
View file

@ -43,8 +43,15 @@ def cmd_flavours(json: bool = False):
block = [prefix + line for line in block] block = [prefix + line for line in block]
results += block results += block
else: else:
f.pkgbuild = f.pkgbuild.name if f.pkgbuild else None
d = dict(f) d = dict(f)
d["description"] = f.flavour_info.description if (f.flavour_info and f.flavour_info.description) else f.description
if "flavour_info" in d and d["flavour_info"]:
for k in set(d["flavour_info"].keys()) - set(['description']):
d[k] = d["flavour_info"][k]
del d["flavour_info"]
d["pkgbuild"] = f.pkgbuild.path if f.pkgbuild else None
d["package"] = f.pkgbuild.name
d["arches"] = sorted(f.pkgbuild.arches) if f.pkgbuild else None
results += [d] results += [d]
print() print()
if json: if json: