diff --git a/pmb/config/__init__.py b/pmb/config/__init__.py index 658f9619..0e93da69 100644 --- a/pmb/config/__init__.py +++ b/pmb/config/__init__.py @@ -222,32 +222,32 @@ apkbuild_attributes = { "makedepends": {"array": True}, "checkdepends": {"array": True}, "options": {"array": True}, - "pkgname": {"array": False}, - "pkgdesc": {"array": False}, - "pkgrel": {"array": False}, - "pkgver": {"array": False}, + "pkgname": {}, + "pkgdesc": {}, + "pkgrel": {}, + "pkgver": {}, "provides": {"array": True}, "subpackages": {"array": True}, - "url": {"array": False}, + "url": {}, # cross-compilers "makedepends_build": {"array": True}, "makedepends_host": {"array": True}, # kernels - "_flavor": {"array": False}, - "_device": {"array": False}, - "_kernver": {"array": False}, + "_flavor": {}, + "_device": {}, + "_kernver": {}, # mesa - "_llvmver": {"array": False}, + "_llvmver": {}, # Overridden packages - "_pkgver": {"array": False}, - "_pkgname": {"array": False}, + "_pkgver": {}, + "_pkgname": {}, # git commit - "_commit": {"array": False}, + "_commit": {}, "source": {"array": True}, } diff --git a/pmb/parse/_apkbuild.py b/pmb/parse/_apkbuild.py index e5006fb2..a5170d2a 100644 --- a/pmb/parse/_apkbuild.py +++ b/pmb/parse/_apkbuild.py @@ -243,7 +243,7 @@ def apkbuild(args, path, check_pkgver=True, check_pkgname=True): # Split attributes for attribute, options in pmb.config.apkbuild_attributes.items(): - if options["array"]: + if options.get("array", False): # Split up arrays, delete empty strings inside the list ret[attribute] = list(filter(None, ret[attribute].split(" ")))