diff options
| author | Jürg Billeter <j@bitron.ch> | 2017-11-22 17:32:49 +0100 |
|---|---|---|
| committer | Jürg Billeter <j@bitron.ch> | 2018-01-16 15:56:07 +0100 |
| commit | f4260e7e0dff92403a4712bb0210f98a044aec1b (patch) | |
| tree | 83fed2a3ee6be8d8fe633aa8621f9be485d1b5f4 | |
| parent | e50a5bf3b8aa254a159c925283b21e44295c7ec3 (diff) | |
| download | buildstream-f4260e7e0dff92403a4712bb0210f98a044aec1b.tar.gz | |
_loader.py: Pass Loader instance to LoadElement
Loader access will be required for junctions.
| -rw-r--r-- | buildstream/_loader.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/buildstream/_loader.py b/buildstream/_loader.py index b7fad2c1b..66156da58 100644 --- a/buildstream/_loader.py +++ b/buildstream/_loader.py @@ -69,11 +69,11 @@ class Dependency(): # class LoadElement(): - def __init__(self, data, filename, elements): + def __init__(self, data, filename, loader): self.data = data self.name = filename - self.elements = elements + self.loader = loader # Ensure the root node is valid _yaml.node_validate(self.data, [ @@ -107,7 +107,7 @@ class LoadElement(): self.dep_cache = {} for dep in self.deps: - elt = self.elements[dep.name] + elt = self.loader.elements[dep.name] # Ensure the cache of the element we depend on elt.ensure_depends_cache() @@ -277,7 +277,7 @@ class Loader(): data = _yaml.load(fullpath, shortname=filename, copy_tree=rewritable) self.options.process_node(data) - element = LoadElement(data, filename, self.elements) + element = LoadElement(data, filename, self) self.elements[filename] = element |