Skip to content

Commit 17b1273

Browse files
committed
sanity_checks: treat meson_version '>=0.N' as '>=0.N.0'
Don't annotate the meson_version as a warning just because the version request is missing a trailing '.0'. If we don't find any versioned features, report the minimum version as 0.0.0 so we don't have to special-case the canonicalization. We'll still accept '>=0' in meson.build.
1 parent 14e13e4 commit 17b1273

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

tools/sanity_checks.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,8 @@ def get_meson_version_deps(self, name: str, builddir: str, wrap: configparser.Co
763763
version_request = project_args.get('meson_version')
764764
if version_request:
765765
version_request = version_request.replace(' ', '')
766+
while version_request.count('.') < 2:
767+
version_request += '.0'
766768

767769
options = ['-Dpython.install_env=auto', f'-Dwraps={name}']
768770
options += [f'-D{o}' for o in ci.get('build_options', [])]
@@ -809,9 +811,9 @@ def get_meson_version_deps(self, name: str, builddir: str, wrap: configparser.Co
809811
min_version = versions[-1]
810812
else:
811813
message = 'No versioned features found.'
812-
min_version = '0'
814+
min_version = '0.0.0'
813815
return (
814-
'warning' if (version_request or '>=0') != f'>={min_version}' else 'notice',
816+
'warning' if (version_request or '>=0.0.0') != f'>={min_version}' else 'notice',
815817
f'Minimum Meson version is {min_version}',
816818
message
817819
)

0 commit comments

Comments
 (0)