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

Support minimum version in VagueDependency.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-26 12:29:56 +00:00
parent 7bc15f3cd1
commit 81a9f6f53f
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ognibuild/buildlog.py
View file

@ -129,7 +129,7 @@ def problem_to_upstream_requirement(problem): # noqa: C901
elif isinstance(problem, MissingNodePackage): elif isinstance(problem, MissingNodePackage):
return NodePackageRequirement(problem.package) return NodePackageRequirement(problem.package)
elif isinstance(problem, MissingVagueDependency): elif isinstance(problem, MissingVagueDependency):
return VagueDependencyRequirement(problem.name) return VagueDependencyRequirement(problem.name, minimum_version=problem.minimum_version)
elif isinstance(problem, MissingLibrary): elif isinstance(problem, MissingLibrary):
return LibraryRequirement(problem.library) return LibraryRequirement(problem.library)
elif isinstance(problem, MissingRubyFile): elif isinstance(problem, MissingRubyFile):

10
ognibuild/requirements.py
View file

@ -149,23 +149,25 @@ class PerlModuleRequirement(Requirement):
class VagueDependencyRequirement(Requirement): class VagueDependencyRequirement(Requirement):
name: str name: str
minimum_version: Optional[str] = None
def __init__(self, name): def __init__(self, name, minimum_version=None):
super(VagueDependencyRequirement, self).__init__("vague") super(VagueDependencyRequirement, self).__init__("vague")
self.name = name self.name = name
self.minimum_version = minimum_version
def expand(self): def expand(self):
if " " not in self.name: if " " not in self.name:
yield BinaryRequirement(self.name) yield BinaryRequirement(self.name)
yield LibraryRequirement(self.name) yield LibraryRequirement(self.name)
yield PkgConfigRequirement(self.name) yield PkgConfigRequirement(self.name, minimum_version=self.minimum_version)
if self.name.lower() != self.name: if self.name.lower() != self.name:
yield BinaryRequirement(self.name.lower()) yield BinaryRequirement(self.name.lower())
yield LibraryRequirement(self.name.lower()) yield LibraryRequirement(self.name.lower())
yield PkgConfigRequirement(self.name.lower()) yield PkgConfigRequirement(self.name.lower(), minimum_version=self.minimum_version)
from .resolver.apt import AptRequirement from .resolver.apt import AptRequirement
yield AptRequirement.simple(self.name.lower()) yield AptRequirement.simple(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():