diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2018-09-14 17:52:13 +0100 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-09-16 00:46:50 +0300 |
commit | 73b47e00250de335513172f0ed0284cd4ac31599 (patch) | |
tree | 663a9d912fd749c656d7681296b9cf8e837dcd4e | |
parent | 3f51745b414d027785666aa6790aff1bdb36b3c8 (diff) | |
download | meson-73b47e00250de335513172f0ed0284cd4ac31599.zip meson-73b47e00250de335513172f0ed0284cd4ac31599.tar.gz meson-73b47e00250de335513172f0ed0284cd4ac31599.tar.bz2 |
Fix incorrect feature check warning
Fix the special handling of '>=0.nn' constraints in project(meson_version:)
for feature checks when the constraint version contains spaces
-rw-r--r-- | mesonbuild/mesonlib.py | 1 | ||||
-rwxr-xr-x | run_unittests.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index 8a2dc0c..bbab2ef 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -520,6 +520,7 @@ def version_compare_condition_with_min(condition, minimum): # # Map versions in the constraint of the form '0.46' to '0.46.0', to embed # this knowledge of the meson versioning scheme. + condition = condition.strip() if re.match('^\d+.\d+$', condition): condition += '.0' diff --git a/run_unittests.py b/run_unittests.py index 96802cc..d9616ea 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2973,7 +2973,7 @@ class FailureTests(BasePlatformTests): # Same as above, except the meson version is now appropriate self.assertMesonDoesNotOutput("dict = {}", ".*WARNING.*Project targetting.*but.*", - meson_version='>= 0.47.0') + meson_version='>= 0.47') def test_using_too_recent_feature_dependency(self): self.assertMesonOutputs("dependency('pcap', required: false)", |