Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Prevent going into the same subdirectory multiple times.

This commit is contained in:
Jussi Pakkanen 2013-03-15 22:27:03 +02:00
parent ecd46332af
commit 18c78c1bb9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
interpreter.py
View File

@ -507,6 +507,7 @@ class Interpreter():
self.subdir = '' self.subdir = ''
self.generators = [] self.generators = []
self.coredata = self.environment.get_coredata() self.coredata = self.environment.get_coredata()
self.visited_subdirs = {}
def build_func_dict(self): def build_func_dict(self):
self.funcs = {'project' : self.func_project, self.funcs = {'project' : self.func_project,
@ -726,7 +727,12 @@ class Interpreter():
raise InvalidArguments('Line %d: subdir command takes no keyword arguments.' % node.lineno()) raise InvalidArguments('Line %d: subdir command takes no keyword arguments.' % node.lineno())
self.validate_arguments(args, 1, [str]) self.validate_arguments(args, 1, [str])
prev_subdir = self.subdir prev_subdir = self.subdir
self.subdir = os.path.join(prev_subdir, args[0]) subdir = os.path.join(prev_subdir, args[0])
if subdir in self.visited_subdirs:
raise InvalidArguments('Line %d: tried to enter subdir "%s", which has already been visited.'\
% (node.lineno(), subdir))
self.visited_subdirs[subdir] = True
self.subdir = subdir
buildfilename = os.path.join(self.subdir, environment.build_filename) buildfilename = os.path.join(self.subdir, environment.build_filename)
self.build_def_files.append(buildfilename) self.build_def_files.append(buildfilename)
code = open(os.path.join(self.environment.get_source_dir(), buildfilename)).read() code = open(os.path.join(self.environment.get_source_dir(), buildfilename)).read()