diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-07-21 22:52:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 22:52:16 +0300 |
| commit | 5d36d2905fe71fae83a8d8eff37ca0bf47ec9f63 (patch) | |
| tree | d92d88421b3957ab2a2617eff83f43ef495b7d08 /mesonbuild/interpreter | |
| parent | 2379fc72bcd598e84f1b6b4e27a2f11cfff644f3 (diff) | |
| parent | 0183954ea1219b2f86c8c7e15431a0908a8aa776 (diff) | |
| download | meson-5d36d2905fe71fae83a8d8eff37ca0bf47ec9f63.tar.gz | |
Merge pull request #9011 from xclaesse/meson-version-compare
Regression: Fix version check for MesonMain methods
Diffstat (limited to 'mesonbuild/interpreter')
| -rw-r--r-- | mesonbuild/interpreter/dependencyfallbacks.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/mesonmain.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/dependencyfallbacks.py b/mesonbuild/interpreter/dependencyfallbacks.py index 019073c4a..2639e4212 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 488b034ce..97940d36b 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 bea12e048..97a695b9d 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, |
