From 2269458ee9c49bed041c425ad56f69dd7d60dc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Sat, 20 Mar 2021 12:45:34 +0000 Subject: [PATCH 1/2] Fix handling of MissingPythonDistribution. --- ognibuild/buildlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ognibuild/buildlog.py b/ognibuild/buildlog.py index d67270b..4b4857e 100644 --- a/ognibuild/buildlog.py +++ b/ognibuild/buildlog.py @@ -163,7 +163,7 @@ def problem_to_upstream_requirement(problem): # noqa: C901 ) elif isinstance(problem, MissingPythonDistribution): return PythonPackageRequirement( - problem.module, + problem.distribution, python_version=problem.python_version, minimum_version=problem.minimum_version, ) From 1edc111bc3bc375aa82bfd5a0d03203cd487c150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Sat, 20 Mar 2021 12:50:23 +0000 Subject: [PATCH 2/2] Strip newlines. --- ognibuild/buildsystem.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ognibuild/buildsystem.py b/ognibuild/buildsystem.py index f42b8a2..96326ce 100644 --- a/ognibuild/buildsystem.py +++ b/ognibuild/buildsystem.py @@ -681,7 +681,7 @@ class DistInkt(BuildSystem): if not line.startswith(b";;"): continue try: - (key, value) = line[2:].split(b"=", 1) + (key, value) = line[2:].strip().split(b"=", 1) except ValueError: continue 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): out = session.check_output(["dzil", "authordeps"]) for entry in out.splitlines(): - yield "build", PerlModuleRequirement(entry.decode()) + yield "build", PerlModuleRequirement(entry.decode().strip()) class Make(BuildSystem):