element.py: Always expand all variables at element creation

This will allow all users to not have to care about whether the option
is expanded or not, making it easier to use variables everywhere

2 files changed, 5 insertions, 6 deletions

diff --git a/src/buildstream/plugins/elements/import.py b/src/buildstream/plugins/elements/import.py
index d9961aa6f..de7ee8af4 100644
--- a/src/buildstream/plugins/elements/import.py
+++ b/src/buildstream/plugins/elements/import.py
@@ -46,8 +46,8 @@ class ImportElement(Element):
     def configure(self, node):
         node.validate_keys(["source", "target"])
 
-        self.source = self.node_subst_vars(node.get_scalar("source"))
-        self.target = self.node_subst_vars(node.get_scalar("target"))
+        self.source = node.get_str("source")
+        self.target = node.get_str("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 9d780ebe2..502212e10 100644
--- a/src/buildstream/plugins/elements/script.py
+++ b/src/buildstream/plugins/elements/script.py
@@ -46,14 +46,13 @@ class ScriptElement(buildstream.ScriptElement):
 
     def configure(self, node):
         for n in node.get_sequence("layout", []):
-            dst = self.node_subst_vars(n.get_scalar("destination"))
-            elm = self.node_subst_vars(n.get_scalar("element", None))
+            dst = n.get_str("destination")
+            elm = n.get_str("element", None)
             self.layout_add(elm, dst)
 
         node.validate_keys(["commands", "root-read-only", "layout"])
 
-        cmds = self.node_subst_sequence_vars(node.get_sequence("commands"))
-        self.add_commands("commands", cmds)
+        self.add_commands("commands", node.get_str_list("commands"))
 
         self.set_work_dir()
         self.set_install_root()