From eade730fc3b10b57f00c54d8a2964245b9160087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 17 Mar 2021 18:36:02 +0000 Subject: [PATCH] Fix == in python version string matching. --- ognibuild/buildsystem.py | 6 ++++++ ognibuild/resolver/apt.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ognibuild/buildsystem.py b/ognibuild/buildsystem.py index d30b397..439b99e 100644 --- a/ognibuild/buildsystem.py +++ b/ognibuild/buildsystem.py @@ -529,6 +529,12 @@ class DistInkt(BuildSystem): ): return cls(os.path.join(path, "dist.ini")) + def get_declared_dependencies(self): + import subprocess + out = subprocess.check_output(["dzil", "authordeps"]) + for entry in out.splitlines(): + yield "build", PerlModuleRequirement(entry.decode()) + class Make(BuildSystem): diff --git a/ognibuild/resolver/apt.py b/ognibuild/resolver/apt.py index ffc6934..a1d33e5 100644 --- a/ognibuild/resolver/apt.py +++ b/ognibuild/resolver/apt.py @@ -108,7 +108,7 @@ def python_spec_to_apt_rels(pkg_name, specs): rels.extend([{"name": pkg_name, "version": ('>=', deb_version)}, {"name": pkg_name, "version": ('<<', next_maj_deb_version)}]) else: - c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "=": "="}[spec[0]] + c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "==": "="}[spec[0]] rels.append([{"name": pkg_name, "version": (c, deb_version)}]) return rels