summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2017-11-13 12:59:09 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2017-11-14 13:03:50 +0000
commitc92746c0092edd63e7c714dce71b78bbe59499e1 (patch)
tree0abb0c5438853faf3e263f13f24ae64ac5748767
parente46be24abfbb3ed00d2bdad67ba86749f3b0f03d (diff)
downloadbuildstream-c92746c0092edd63e7c714dce71b78bbe59499e1.tar.gz
Make node_subst_member pass default values as positional args
-rw-r--r--buildstream/plugins/elements/script.py2
-rw-r--r--tests/project/data/plugins/elements/custom.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/buildstream/plugins/elements/script.py b/buildstream/plugins/elements/script.py
index 32d03be7e..77923d5ae 100644
--- a/buildstream/plugins/elements/script.py
+++ b/buildstream/plugins/elements/script.py
@@ -43,7 +43,7 @@ class ScriptElement(buildstream.ScriptElement):
def configure(self, node):
for n in self.node_get_member(node, list, 'layout', []):
dst = self.node_subst_member(n, 'destination')
- elm = self.node_subst_member(n, 'element', default_value='') or None
+ elm = self.node_subst_member(n, 'element', '') or None
self.layout_add(elm, dst)
self.node_validate(node, [
diff --git a/tests/project/data/plugins/elements/custom.py b/tests/project/data/plugins/elements/custom.py
index 97379316c..e27e859e5 100644
--- a/tests/project/data/plugins/elements/custom.py
+++ b/tests/project/data/plugins/elements/custom.py
@@ -6,7 +6,7 @@ class CustomElement(Element):
def configure(self, node):
print("Element Data: %s" % node)
self.node_validate(node, ['configuration'])
- self.configuration = self.node_subst_member(node, "configuration", default_value='')
+ self.configuration = self.node_subst_member(node, "configuration", '')
def preflight(self):
pass