billchenchina/ognibuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix apt expansion for vague dependencies.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-26 12:52:11 +00:00
parent 9bfac89e7e
commit 8fd1d4035d
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ognibuild/requirements.py
View file

@ -168,6 +168,7 @@ class VagueDependencyRequirement(Requirement):
from .resolver.apt import AptRequirement from .resolver.apt import AptRequirement
yield AptRequirement.simple(self.name.lower(), minimum_version=self.minimum_version) yield AptRequirement.simple(self.name.lower(), minimum_version=self.minimum_version)
yield AptRequirement.simple('lib%s-dev' % self.name.lower(), minimum_version=self.minimum_version)
def met(self, session): def met(self, session):
for x in self.expand(): for x in self.expand():

4
ognibuild/resolver/apt.py
View file

@ -615,6 +615,10 @@ def resolve_ca_req(apt_mgr, req):
def resolve_apt_req(apt_mgr, req): def resolve_apt_req(apt_mgr, req):
# TODO(jelmer): This should be checking whether versions match as well.
for package_name in req.package_names():
if not apt_mgr.package_exists(package_name):
return []
return [req] return [req]