forked from Mirror/pmbootstrap
Index parser: support multiple package providers (#1202)
* The APKINDEX parser used to return a dictionary with one package for a given package name. This works for the installed packages database, because there can only be one provider for a package. But when parsing packages from binary repositories, we need to support multiple providers for one package. It is now possible to get a dictionary with either multiple providers, or just a single provider for each package. * Dependency parsing logic has been adjusted, to support multiple providers. For multiple providers, the one with the same package name as the package we are looking up is prefered. If there is none (eg. "so:libEGL.so.1" is provided by "mesa-egl"), it prefers packages that will be installed anyway, and after that packages that are already installed. When all else fails, it just picks the first one and prints a note in the "pmbootstrap log". * Added testcases for all functions in pmb.parse.apkindex and pmb.parse.depends * pmbootstrap chroot has a new "--add" parameter to specify packages that pmbootstrap should build if neccessary, and install in the chroot. This can be used to quickly test the depencency resolution of pmbootstrap without doing a full "pmbootstrap install". Fixes #1122.
This commit is contained in:
parent
481c99f50c
commit
db5e69630e
22 changed files with 850 additions and 231 deletions
|
@ -98,8 +98,8 @@ def auto_apkindex_package(args, pkgname, aport_version, apkindex, arch,
|
|||
:returns: True when there was an APKBUILD that needed to be changed.
|
||||
"""
|
||||
# Binary package
|
||||
binary = pmb.parse.apkindex.read(args, pkgname, apkindex,
|
||||
False)
|
||||
binary = pmb.parse.apkindex.package(args, pkgname, must_exist=False,
|
||||
indexes=[apkindex])
|
||||
if not binary:
|
||||
return
|
||||
|
||||
|
@ -124,8 +124,9 @@ def auto_apkindex_package(args, pkgname, aport_version, apkindex, arch,
|
|||
",".join(binary["depends"]))
|
||||
missing = []
|
||||
for depend in binary["depends"]:
|
||||
if not pmb.parse.apkindex.read_any_index(args, depend,
|
||||
arch):
|
||||
providers = pmb.parse.apkindex.providers(args, depend, arch,
|
||||
must_exist=False)
|
||||
if providers == {}:
|
||||
# We're only interested in missing depends starting with "so:"
|
||||
# (which means dynamic libraries that the package was linked
|
||||
# against) and packages for which no aport exists.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue