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

cope with missing version tag.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-04-22 16:13:11 +01:00
parent 3cc91b8cb0
commit c2838029b5
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ognibuild/buildsystem.py
View file

@ -1373,10 +1373,11 @@ class Maven(BuildSystem):
deps_tag = root.find("dependencies") deps_tag = root.find("dependencies")
if deps_tag: if deps_tag:
for dep in deps_tag.findall("dependency"): for dep in deps_tag.findall("dependency"):
version_tag = dep.find("version")
yield "core", MavenArtifactRequirement( yield "core", MavenArtifactRequirement(
dep.find("groupId").text, dep.find("groupId").text,
dep.find("artifactId").text, dep.find("artifactId").text,
dep.find("version").text, version_tag.text if version_tag else None,
) )

2
ognibuild/requirements.py
View file

@ -213,10 +213,12 @@ class PerlPreDeclaredRequirement(Requirement):
KNOWN_MODULES = { KNOWN_MODULES = {
'auto_set_repository': 'Module::Install::Repository', 'auto_set_repository': 'Module::Install::Repository',
'author_tests': 'Module::Install::AuthorTests', 'author_tests': 'Module::Install::AuthorTests',
'author_requires': 'Module::Install::AuthorRequires',
'readme_from': 'Module::Install::ReadmeFromPod', 'readme_from': 'Module::Install::ReadmeFromPod',
'catalyst': 'Module::Install::Catalyst', 'catalyst': 'Module::Install::Catalyst',
'githubmeta': 'Module::Install::GithubMeta', 'githubmeta': 'Module::Install::GithubMeta',
'use_ppport': 'Module::Install::XSUtil', 'use_ppport': 'Module::Install::XSUtil',
'pod_from': 'Module::Install::PodFromEuclid',
} }
def __init__(self, name): def __init__(self, name):