From 93a1cff174d0a7a564783f200d7360162cb6cbc3 Mon Sep 17 00:00:00 2001 From: Guillaume Poirier-Morency Date: Sat, 13 May 2017 10:09:25 -0400 Subject: interpreter: Prevent top-level subdirectories from using 'meson-' prefix These are reserved for internal usages like 'meson-private' or 'meson-logs'. --- mesonbuild/interpreter.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mesonbuild/interpreter.py') 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): -- cgit v1.1