diff options
| author | Eli Schwartz <eschwartz93@gmail.com> | 2023-09-28 18:35:14 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2023-09-28 18:39:43 -0400 |
| commit | fc45b57cf9f81f47c0f166dd45628d4254c71b93 (patch) | |
| tree | 30a58119727ead371fa34ed5613b3dadfb73c4ba | |
| parent | 32be9bd6de0a4769cdf6d9528496925643739918 (diff) | |
| download | meson-fc45b57cf9f81f47c0f166dd45628d4254c71b93.tar.gz | |
fix regression that broke sanity checking of jar sources
In commit dd22546bdd5b7de34025437ae1360f6dd20491eb the various
typed_pos_args for different BuildTarget functions was refactored into a
common tuple of types.
It overlooked the fact that jar specifically does NOT accept the same
types, and began to allow passing structured_sources in.
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 8950f0c44..3093ad2ef 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -1859,10 +1859,10 @@ class Interpreter(InterpreterBase, HoldableObject): return self.build_library(node, args, kwargs) @permittedKwargs(build.known_jar_kwargs) - @typed_pos_args('jar', str, varargs=SOURCES_VARARGS) + @typed_pos_args('jar', str, varargs=(str, mesonlib.File, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList, build.ExtractedObjects, build.BuildTarget)) @typed_kwargs('jar', *JAR_KWS, allow_unknown=True) def func_jar(self, node: mparser.BaseNode, - args: T.Tuple[str, SourcesVarargsType], + args: T.Tuple[str, T.List[T.Union[str, mesonlib.File, build.GeneratedTypes]]], kwargs: kwtypes.Jar) -> build.Jar: return self.build_target(node, args, kwargs, build.Jar) |