diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-05-05 19:11:20 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-05-05 21:11:20 +0300 |
| commit | 261878f438261585daa637e147c37dc60922afb1 (patch) | |
| tree | 26e8c3560d5924c3f92a672301d8a29f9c00e56d /mesonbuild/interpreter.py | |
| parent | 128d313b66d2bcb28c149516e8ab3538c88105f1 (diff) | |
| download | meson-261878f438261585daa637e147c37dc60922afb1.zip meson-261878f438261585daa637e147c37dc60922afb1.tar.gz meson-261878f438261585daa637e147c37dc60922afb1.tar.bz2 | |
Fix an assertion exception when misusing install_data
* Failing test case for trying to install_data a custom_target
* Validate install_data() arguments are either string or file
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index ba97083..3f9d464 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -3421,8 +3421,10 @@ This will become a hard error in the future.''' % kwargs['input'], location=self for s in raw_sources: if isinstance(s, mesonlib.File): sources.append(s) - else: + elif isinstance(s, str): source_strings.append(s) + else: + raise InvalidArguments('Argument {!r} must be string or file.'.format(s)) sources += self.source_strings_to_files(source_strings) install_dir = kwargs.get('install_dir', None) if not isinstance(install_dir, (str, type(None))): |