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

Install dzil if it is missing.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-26 02:20:30 +00:00
parent 4237745197
commit 4a8d514f13
No known key found for this signature in database
GPG key ID: 579C160D4C9E23E8
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ognibuild/buildsystem.py
View file

@ -44,7 +44,7 @@ from .requirements import (
GoRequirement, GoRequirement,
GoPackageRequirement, GoPackageRequirement,
) )
from .fix_build import run_with_build_fixers from .fix_build import run_with_build_fixers, run_detecting_problems
from .session import which from .session import which
@ -909,9 +909,9 @@ class DistZilla(BuildSystem):
return cls(os.path.join(path, "dist.ini")) return cls(os.path.join(path, "dist.ini"))
def get_declared_dependencies(self, session, fixers=None): def get_declared_dependencies(self, session, fixers=None):
out = session.check_output(["dzil", "authordeps"]) lines = run_with_build_fixers(session, ["dzil", "authordeps"], fixers)
for entry in out.splitlines(): for entry in lines:
yield "build", PerlModuleRequirement(entry.decode().strip()) yield "build", PerlModuleRequirement(entry.strip())
if os.path.exists(os.path.join(os.path.dirname(self.path), "cpanfile")): if os.path.exists(os.path.join(os.path.dirname(self.path), "cpanfile")):
yield from _declared_deps_from_cpanfile(session) yield from _declared_deps_from_cpanfile(session)

2
ognibuild/fix_build.py
View file

@ -54,7 +54,7 @@ def run_detecting_problems(session: Session, args: List[str], **kwargs):
retcode = 1 retcode = 1
else: else:
if retcode == 0: if retcode == 0:
return return contents
lines = ''.join(contents).splitlines(False) lines = ''.join(contents).splitlines(False)
match, error = find_build_failure_description(lines) match, error = find_build_failure_description(lines)
if error is None: if error is None: