summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-05-11 12:53:02 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-05-11 12:53:02 +0000
commit615682352e4dfdbecbfb389860983060116c34eb (patch)
treed34e9e0bc752d525df25663e214244647aa763ae
parent4adcb0583375bd533c58b5cd9cf827f62659cc08 (diff)
parentbc0d564f8a7a4b67e1cb8b5a49e9e9e0470da250 (diff)
downloadbuildstream-615682352e4dfdbecbfb389860983060116c34eb.tar.gz
Merge branch 'bschubert/fix-node-docs' into 'master'
element.py: Fix documentation around `node` usage See merge request BuildStream/buildstream!1905
-rw-r--r--src/buildstream/element.py2
-rw-r--r--src/buildstream/plugin.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/buildstream/element.py b/src/buildstream/element.py
index 862f00962..d8c0f6f79 100644
--- a/src/buildstream/element.py
+++ b/src/buildstream/element.py
@@ -517,7 +517,7 @@ class Element(Plugin):
# Expect a string 'name' in 'node', substituting any
# variables in the returned string
- name = self.node_subst_vars(node.get_str('name'))
+ name = self.node_subst_vars(node.get_scalar('name'))
"""
try:
return self.__variables.subst(node.as_str())
diff --git a/src/buildstream/plugin.py b/src/buildstream/plugin.py
index ff0604811..dfb54332f 100644
--- a/src/buildstream/plugin.py
+++ b/src/buildstream/plugin.py
@@ -304,7 +304,7 @@ class Plugin:
.. note::
For Elements, when variable substitution is desirable, the
- :func:`Element.node_subst_member() <buildstream.element.Element.node_subst_member>`
+ :func:`Element.node_subst_vars() <buildstream.element.Element.node_subst_vars>`
method can be used.
"""
raise ImplError(