From 4a8d514f13cdba7ea7aab474d40b672b9832c45e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Fri, 26 Mar 2021 02:20:30 +0000 Subject: [PATCH] Install dzil if it is missing. --- ognibuild/buildsystem.py | 8 ++++---- ognibuild/fix_build.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ognibuild/buildsystem.py b/ognibuild/buildsystem.py index 0fb28cf..44c1091 100644 --- a/ognibuild/buildsystem.py +++ b/ognibuild/buildsystem.py @@ -44,7 +44,7 @@ from .requirements import ( GoRequirement, GoPackageRequirement, ) -from .fix_build import run_with_build_fixers +from .fix_build import run_with_build_fixers, run_detecting_problems from .session import which @@ -909,9 +909,9 @@ class DistZilla(BuildSystem): return cls(os.path.join(path, "dist.ini")) def get_declared_dependencies(self, session, fixers=None): - out = session.check_output(["dzil", "authordeps"]) - for entry in out.splitlines(): - yield "build", PerlModuleRequirement(entry.decode().strip()) + lines = run_with_build_fixers(session, ["dzil", "authordeps"], fixers) + for entry in lines: + yield "build", PerlModuleRequirement(entry.strip()) if os.path.exists(os.path.join(os.path.dirname(self.path), "cpanfile")): yield from _declared_deps_from_cpanfile(session) diff --git a/ognibuild/fix_build.py b/ognibuild/fix_build.py index c7b363e..3411cb2 100644 --- a/ognibuild/fix_build.py +++ b/ognibuild/fix_build.py @@ -54,7 +54,7 @@ def run_detecting_problems(session: Session, args: List[str], **kwargs): retcode = 1 else: if retcode == 0: - return + return contents lines = ''.join(contents).splitlines(False) match, error = find_build_failure_description(lines) if error is None: