diff options
author | Benjamin Schubert <contact@benschubert.me> | 2019-10-15 11:51:54 +0100 |
---|---|---|
committer | Benjamin Schubert <contact@benschubert.me> | 2019-10-16 13:52:55 +0100 |
commit | 0cc53801868a0b85c81bb68579153a04cb7a5faf (patch) | |
tree | ef1355c6e0fae77ae60e23a614c95391dded5627 /src/buildstream/_options/optionenum.py | |
parent | 1b92d90b5b95241e9c44d02a63713ca2de8a98f4 (diff) | |
download | buildstream-0cc53801868a0b85c81bb68579153a04cb7a5faf.tar.gz |
_options/option.py: Pass the node instead of the str to 'transform'
This is in order to consolidate how we substitute variables.
_project: use 'node_subst_vars' instead of '_subst_list'
as the first one expects a node.
Diffstat (limited to 'src/buildstream/_options/optionenum.py')
-rw-r--r-- | src/buildstream/_options/optionenum.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/buildstream/_options/optionenum.py b/src/buildstream/_options/optionenum.py index be9799acc..4a0941369 100644 --- a/src/buildstream/_options/optionenum.py +++ b/src/buildstream/_options/optionenum.py @@ -56,9 +56,11 @@ class OptionEnum(Option): def load_value(self, node, *, transform=None): value_node = node.get_scalar(self.name) - self.value = value_node.as_str() if transform: - self.value = transform(self.value) + self.value = transform(value_node) + else: + self.value = value_node.as_str() + self.validate(self.value, value_node) def set_value(self, value): |