diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-07 23:04:11 +0300 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-07 23:04:11 +0300 |
commit | 9235fd4ec1cfdea9f1c73719c80607ee0cdad39b (patch) | |
tree | 39d8ff868ec3a384c407f1e8859d8c55a7e25651 /mesonbuild/interpreter.py | |
parent | 3f62fb788beea1ac32d514d549fdaeaaae0f3292 (diff) | |
download | meson-9235fd4ec1cfdea9f1c73719c80607ee0cdad39b.zip meson-9235fd4ec1cfdea9f1c73719c80607ee0cdad39b.tar.gz meson-9235fd4ec1cfdea9f1c73719c80607ee0cdad39b.tar.bz2 |
Permit use of file objects in run targets.
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 0c53326..361e0aa 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1873,12 +1873,12 @@ class Interpreter(): raise InterpreterException('Run_target needs at least one positional argument.') cleaned_args = [] - for i in all_args: + for i in mesonlib.flatten(all_args): try: i = i.held_object except AttributeError: pass - if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram)): + if not isinstance(i, (str, build.BuildTarget, build.CustomTarget, dependencies.ExternalProgram, mesonlib.File)): mlog.debug('Wrong type:', str(i)) raise InterpreterException('Invalid argument to run_target.') cleaned_args.append(i) |