diff options
| author | Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com> | 2017-05-13 10:09:25 -0400 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-05-29 19:42:03 +0300 |
| commit | 93a1cff174d0a7a564783f200d7360162cb6cbc3 (patch) | |
| tree | 17e69b3806af8da37823208861f0edb17e59992d /mesonbuild/interpreter.py | |
| parent | a195b78c8ded169f180d8bd6b437f52d47ce7bae (diff) | |
| download | meson-93a1cff174d0a7a564783f200d7360162cb6cbc3.zip meson-93a1cff174d0a7a564783f200d7360162cb6cbc3.tar.gz meson-93a1cff174d0a7a564783f200d7360162cb6cbc3.tar.bz2 | |
interpreter: Prevent top-level subdirectories from using 'meson-' prefix
These are reserved for internal usages like 'meson-private' or
'meson-logs'.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 63725ab..ca3cf75 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2227,6 +2227,8 @@ class Interpreter(InterpreterBase): raise InvalidArguments('Subdir contains ..') if self.subdir == '' and args[0] == self.subproject_dir: raise InvalidArguments('Must not go into subprojects dir with subdir(), use subproject() instead.') + if self.subdir == '' and args[0].startswith('meson-'): + raise InvalidArguments('The "meson-" prefix is reserved and cannot be used for top-level subdir().') prev_subdir = self.subdir subdir = os.path.join(prev_subdir, args[0]) if os.path.isabs(subdir): |