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

Fix == in python version string matching.

Browse source
This commit is contained in:
Jelmer Vernooij 2021-03-17 18:36:02 +00:00
parent f2515552e4
commit eade730fc3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ognibuild/buildsystem.py
View file

@ -529,6 +529,12 @@ class DistInkt(BuildSystem):
): ):
return cls(os.path.join(path, "dist.ini")) 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): class Make(BuildSystem):

2
ognibuild/resolver/apt.py
View file

@ -108,7 +108,7 @@ def python_spec_to_apt_rels(pkg_name, specs):
rels.extend([{"name": pkg_name, "version": ('>=', deb_version)}, rels.extend([{"name": pkg_name, "version": ('>=', deb_version)},
{"name": pkg_name, "version": ('<<', next_maj_deb_version)}]) {"name": pkg_name, "version": ('<<', next_maj_deb_version)}])
else: else:
c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "=": "="}[spec[0]] c = {">=": ">=", "<=": "<=", "<": "<<", ">": ">>", "==": "="}[spec[0]]
rels.append([{"name": pkg_name, "version": (c, deb_version)}]) rels.append([{"name": pkg_name, "version": (c, deb_version)}])
return rels return rels