From 8fd1d4035d0383f8833db622639a2060cc925789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 26 Mar 2021 12:52:11 +0000 Subject: [PATCH] Fix apt expansion for vague dependencies. --- ognibuild/requirements.py | 1 + ognibuild/resolver/apt.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/ognibuild/requirements.py b/ognibuild/requirements.py index 802d5ba..7491b19 100644 --- a/ognibuild/requirements.py +++ b/ognibuild/requirements.py @@ -168,6 +168,7 @@ class VagueDependencyRequirement(Requirement): from .resolver.apt import AptRequirement 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): for x in self.expand(): diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index 383ef77..f672836 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -615,6 +615,10 @@ def resolve_ca_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]