diff options
| author | Xavier Claessens <xavier.claessens@collabora.com> | 2020-08-14 17:41:18 -0400 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-09-02 12:55:31 -0400 |
| commit | 9365486104dc66ee05d5bfaf97a0e83ce9d1289d (patch) | |
| tree | 778b787e9973e3b0eab2bf80903a2e77aeca3634 /mesonbuild/interpreter.py | |
| parent | bfb8d25deb794e9506775caa023bbf278dcf17e1 (diff) | |
| download | meson-9365486104dc66ee05d5bfaf97a0e83ce9d1289d.zip meson-9365486104dc66ee05d5bfaf97a0e83ce9d1289d.tar.gz meson-9365486104dc66ee05d5bfaf97a0e83ce9d1289d.tar.bz2 | |
Special case meson.version().version_compare() statement
when that statement gets evaluated, the interpreter remembers the
version target and if it was part of the evaluation of a `if` condition
then the target meson version is temporally overriden within that
if-block.
Fixes: #7590
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 2924172..322cc26 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -30,7 +30,7 @@ from .interpreterbase import check_stringlist, flatten, noPosargs, noKwargs, str from .interpreterbase import InterpreterException, InvalidArguments, InvalidCode, SubdirDoneRequest from .interpreterbase import InterpreterObject, MutableInterpreterObject, Disabler, disablerIfNotFound from .interpreterbase import FeatureNew, FeatureDeprecated, FeatureNewKwargs, FeatureDeprecatedKwargs -from .interpreterbase import ObjectHolder +from .interpreterbase import ObjectHolder, MesonVersionString from .modules import ModuleReturnValue from .cmake import CMakeInterpreter from .backend.backends import TestProtocol @@ -2172,7 +2172,7 @@ class MesonMain(InterpreterObject): @noPosargs @permittedKwargs({}) def version_method(self, args, kwargs): - return coredata.version + return MesonVersionString(coredata.version) @noPosargs @permittedKwargs({}) |