parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 13:45:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages.filter_packages(): optionally check package arch

Browse source
This commit is contained in:
InsanePrawn 2022-08-28 03:04:48 +02:00
parent bb14c4d779
commit fb4a12c464
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/__init__.py
View file

@ -80,6 +80,7 @@ def init_prebuilts(arch: Arch, dir: str = None):
def filter_packages( def filter_packages(
paths: Iterable[str], paths: Iterable[str],
repo: Optional[dict[str, Pkgbuild]] = None, repo: Optional[dict[str, Pkgbuild]] = None,
arch: Optional[Arch] = None,
allow_empty_results=True, allow_empty_results=True,
use_paths=True, use_paths=True,
use_names=True, use_names=True,
@ -96,7 +97,12 @@ def filter_packages(
comparison.add(pkg.path) comparison.add(pkg.path)
if use_names: if use_names:
comparison.add(pkg.name) comparison.add(pkg.name)
if comparison.intersection(paths): matches = list(comparison.intersection(paths))
if matches:
assert pkg.arches
if arch and not set([arch, 'any']).intersection(pkg.arches):
logging.warn(f"Pkg {pkg.name} matches query {matches[0]} but isn't available for architecture {arch}: {pkg.arches}")
continue
result += [pkg] result += [pkg]
if not allow_empty_results and not result: if not allow_empty_results and not result:
@ -647,7 +653,7 @@ def build_packages_by_paths(
assert config.runtime.arch assert config.runtime.arch
for _arch in set([arch, config.runtime.arch]): for _arch in set([arch, config.runtime.arch]):
init_prebuilts(_arch) init_prebuilts(_arch)
packages = filter_packages(paths, repo=repo, allow_empty_results=False) packages = filter_packages(paths, arch=arch, repo=repo, allow_empty_results=False)
return build_packages( return build_packages(
packages, packages,
arch, arch,