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

Merge branch 'main' of https://github.com/jelmer/ognibuild

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-20 12:50:47 +00:00
commit 1cb0193cdd
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ognibuild/buildlog.py
View file

@ -163,7 +163,7 @@ def problem_to_upstream_requirement(problem): # noqa: C901
) )
elif isinstance(problem, MissingPythonDistribution): elif isinstance(problem, MissingPythonDistribution):
return PythonPackageRequirement( return PythonPackageRequirement(
problem.module, problem.distribution,
python_version=problem.python_version, python_version=problem.python_version,
minimum_version=problem.minimum_version, minimum_version=problem.minimum_version,
) )

4
ognibuild/buildsystem.py
View file

@ -681,7 +681,7 @@ class DistInkt(BuildSystem):
if not line.startswith(b";;"): if not line.startswith(b";;"):
continue continue
try: try:
(key, value) = line[2:].split(b"=", 1) (key, value) = line[2:].strip().split(b"=", 1)
except ValueError: except ValueError:
continue continue
if key.strip() == b"class" and value.strip().startswith(b"'Dist::Inkt"): if key.strip() == b"class" and value.strip().startswith(b"'Dist::Inkt"):
@ -720,7 +720,7 @@ class DistInkt(BuildSystem):
def get_declared_dependencies(self, session, fixers=None): def get_declared_dependencies(self, session, fixers=None):
out = session.check_output(["dzil", "authordeps"]) out = session.check_output(["dzil", "authordeps"])
for entry in out.splitlines(): for entry in out.splitlines():
yield "build", PerlModuleRequirement(entry.decode()) yield "build", PerlModuleRequirement(entry.decode().strip())
class Make(BuildSystem): class Make(BuildSystem):