synit
/
pmbootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pmb.helpers.package.get: prefer right arch binary (!1776) 

When the pmaport arch does not match, but there's a matching binary
package, return the binary package instead of the pmaport.

This is needed to fix "pmbootstrap repo_missing" for x86_64
networkmanager-qt, which indirectly depends on mesa (and mesa needs to
be taken from the binary packages for x86_64, not from the pmaports,
see #1741).
This commit is contained in:
Oliver Smith 2019-04-20 01:23:18 +02:00
parent 99e7ae3019
commit 45c9eaa3ea
No known key found for this signature in database
GPG Key ID: 5AE7F5513E0885CB
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pmb/helpers/package.py
View File

@ -67,9 +67,15 @@ def get(args, pkgname, arch, replace_subpkgnames=False):
"version": pmaport["pkgver"] + "-r" + pmaport["pkgrel"]}
# Find in APKINDEX (given arch)
if not ret:
if not ret or not pmb.helpers.pmaports.check_arches(ret["arch"], arch):
pmb.helpers.repo.update(args, arch)
ret = pmb.parse.apkindex.package(args, pkgname, arch, False)
ret_repo = pmb.parse.apkindex.package(args, pkgname, arch, False)
# Save as result if there was no pmaport, or if the pmaport can not be
# built for the given arch, but there is a binary package for that arch
# (e.g. temp/mesa can't be built for x86_64, but Alpine has it)
if not ret or ret_repo["arch"] == arch:
ret = ret_repo
# Find in APKINDEX (other arches)
if not ret: