Commit b8b3ac38 authored by William Kamp's avatar William Kamp

Inherit variables from parent Manifest.py, not just the top Manifest.py

parent 1d1ab3f7
......@@ -118,7 +118,7 @@ PARSE START: %s
if self.parent is None:
extra_context = {}
else:
extra_context = dict(self.top_manifest.manifest_dict)
extra_context = dict(self.parent.manifest_dict)
extra_context["__manifest"] = self.path
# The parse method is where most of the parser action takes place!
......@@ -129,7 +129,8 @@ PARSE START: %s
raise Exception(
"Error while parsing {0}:\n{1}: {2}.".format(
self.path, type(name_error), name_error))
self.manifest_dict = opt_map
self.manifest_dict = extra_context
self.manifest_dict.update(opt_map)
# Process the parsed manifest_dict to assign the module properties
self.process_manifest()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment