summaryrefslogtreecommitdiff
path: root/buildstream/_variables.py
diff options
context:
space:
mode:
authorTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-01-27 23:08:13 +0900
committerTristan Van Berkom <tristan.vanberkom@codethink.co.uk>2017-01-27 23:08:13 +0900
commit7fbac9a462111e04af7c15176c24f84669313039 (patch)
tree45aaf7e76db9c40dfe69365da814b89e3fa9e401 /buildstream/_variables.py
parent47f2365797dd9681ad383cee2222ce2ab5c8ad09 (diff)
downloadbuildstream-7fbac9a462111e04af7c15176c24f84669313039.tar.gz
_variables.py: Fix variable resolution to convert to strings
Not stringish values in variable resolution were not being converted to strings automatically.
Diffstat (limited to 'buildstream/_variables.py')
-rw-r--r--buildstream/_variables.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/buildstream/_variables.py b/buildstream/_variables.py
index f325db714..0b656e806 100644
--- a/buildstream/_variables.py
+++ b/buildstream/_variables.py
@@ -123,6 +123,9 @@ class Variables():
if key == _yaml.PROVENANCE_KEY:
continue
+ # Ensure stringness of the value before substitution
+ value = _yaml.node_get(variables, str, key)
+
resolved_var, item_unmatched = self.subst_internal(value, variables)
resolved[key] = resolved_var
unmatched += item_unmatched