diff options
| author | Benjamin Schubert <contact@benschubert.me> | 2019-10-15 11:57:45 +0100 |
|---|---|---|
| committer | Benjamin Schubert <contact@benschubert.me> | 2019-10-16 13:57:13 +0100 |
| commit | f0c928ed5e0fb61f3dd4e26891a39def0b40be81 (patch) | |
| tree | 1574e0ecc458f842fa1cb37c71c3d8d3a49092ff /src/buildstream/plugins | |
| parent | b07ca0c2ba8c6fdaf3e242f6cbcab84d1bef7060 (diff) | |
| download | buildstream-f0c928ed5e0fb61f3dd4e26891a39def0b40be81.tar.gz | |
element.py: remove 'node_subst_member' and replace with 'node_susbst_vars'
Diffstat (limited to 'src/buildstream/plugins')
| -rw-r--r-- | src/buildstream/plugins/elements/import.py | 4 | ||||
| -rw-r--r-- | src/buildstream/plugins/elements/script.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/buildstream/plugins/elements/import.py b/src/buildstream/plugins/elements/import.py index 9568bd08e..404a0f4ee 100644 --- a/src/buildstream/plugins/elements/import.py +++ b/src/buildstream/plugins/elements/import.py @@ -49,8 +49,8 @@ class ImportElement(Element): 'source', 'target' ]) - self.source = self.node_subst_member(node, 'source') - self.target = self.node_subst_member(node, 'target') + self.source = self.node_subst_vars(node.get_scalar('source')) + self.target = self.node_subst_vars(node.get_scalar('target')) def preflight(self): # Assert that we have at least one source to fetch. diff --git a/src/buildstream/plugins/elements/script.py b/src/buildstream/plugins/elements/script.py index a7b53e422..c63d0a04e 100644 --- a/src/buildstream/plugins/elements/script.py +++ b/src/buildstream/plugins/elements/script.py @@ -47,8 +47,8 @@ class ScriptElement(buildstream.ScriptElement): def configure(self, node): for n in node.get_sequence('layout', []): - dst = self.node_subst_member(n, 'destination') - elm = self.node_subst_member(n, 'element', None) + dst = self.node_subst_vars(n.get_scalar('destination')) + elm = self.node_subst_vars(n.get_scalar('element', None)) self.layout_add(elm, dst) node.validate_keys([ |