diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2021-07-21 12:26:20 -0400 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2021-07-21 13:33:06 -0400 |
commit | 0183954ea1219b2f86c8c7e15431a0908a8aa776 (patch) | |
tree | 3e400584525a487e1081e646f0c486df044ba210 /mesonbuild | |
parent | 9afd589c8b77d1e9d279813a71ec1451476a0be8 (diff) | |
download | meson-0183954ea1219b2f86c8c7e15431a0908a8aa776.zip meson-0183954ea1219b2f86c8c7e15431a0908a8aa776.tar.gz meson-0183954ea1219b2f86c8c7e15431a0908a8aa776.tar.bz2 |
Fix meson.version().version_compare() regression in subproject
Diffstat (limited to 'mesonbuild')
-rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 2 | ||||
-rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
-rw-r--r-- | mesonbuild/interpreter/mesonmain.py | 2 | ||||
-rw-r--r-- | mesonbuild/interpreterbase/baseobjects.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 019073c..2639e42 100644 --- a/mesonbuild/interpreter/dependencyfallbacks.py +++ b/mesonbuild/interpreter/dependencyfallbacks.py @@ -17,7 +17,7 @@ if T.TYPE_CHECKING: class DependencyFallbacksHolder(MesonInterpreterObject): def __init__(self, interpreter: 'Interpreter', names: T.List[str], allow_fallback: T.Optional[bool] = None) -> None: - super().__init__() + super().__init__(subproject=interpreter.subproject) self.interpreter = interpreter self.subproject = interpreter.subproject self.coredata = interpreter.coredata diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 488b034..97940d3 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -2759,4 +2759,4 @@ This will become a hard error in the future.''', location=self.current_node) raise InterpreterException('stop cannot be less than start') if step < 1: raise InterpreterException('step must be >=1') - return RangeHolder(start, stop, step) + return RangeHolder(start, stop, step, subproject=self.subproject) diff --git a/mesonbuild/interpreter/mesonmain.py b/mesonbuild/interpreter/mesonmain.py index bea12e0..97a695b 100644 --- a/mesonbuild/interpreter/mesonmain.py +++ b/mesonbuild/interpreter/mesonmain.py @@ -22,7 +22,7 @@ if T.TYPE_CHECKING: class MesonMain(MesonInterpreterObject): def __init__(self, build: 'build.Build', interpreter: 'Interpreter'): - super().__init__() + super().__init__(subproject=interpreter.subproject) self.build = build self.interpreter = interpreter self.methods.update({'get_compiler': self.get_compiler_method, diff --git a/mesonbuild/interpreterbase/baseobjects.py b/mesonbuild/interpreterbase/baseobjects.py index e65e4cb..8b1293c 100644 --- a/mesonbuild/interpreterbase/baseobjects.py +++ b/mesonbuild/interpreterbase/baseobjects.py @@ -82,7 +82,7 @@ class ObjectHolder(InterpreterObject, T.Generic[InterpreterObjectTypeVar]): return f'<[{type(self).__name__}] holds [{type(self.held_object).__name__}]: {self.held_object!r}>' class RangeHolder(MesonInterpreterObject): - def __init__(self, start: int, stop: int, step: int, *, subproject: T.Optional[str] = None) -> None: + def __init__(self, start: int, stop: int, step: int, *, subproject: str) -> None: super().__init__(subproject=subproject) self.range = range(start, stop, step) |