diff options
Diffstat (limited to 'src/buildstream/_options')
-rw-r--r-- | src/buildstream/_options/optionbool.py | 2 | ||||
-rw-r--r-- | src/buildstream/_options/optionenum.py | 6 | ||||
-rw-r--r-- | src/buildstream/_options/optionflags.py | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/buildstream/_options/optionbool.py b/src/buildstream/_options/optionbool.py index af67df601..f91cb257d 100644 --- a/src/buildstream/_options/optionbool.py +++ b/src/buildstream/_options/optionbool.py @@ -37,7 +37,7 @@ class OptionBool(Option): def load_value(self, node, *, transform=None): if transform: - self.set_value(transform(node.get_str(self.name))) + self.set_value(transform(node.get_scalar(self.name))) else: self.value = node.get_bool(self.name) 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): diff --git a/src/buildstream/_options/optionflags.py b/src/buildstream/_options/optionflags.py index 0ce995709..e5217a718 100644 --- a/src/buildstream/_options/optionflags.py +++ b/src/buildstream/_options/optionflags.py @@ -58,9 +58,10 @@ class OptionFlags(Option): def load_value(self, node, *, transform=None): value_node = node.get_sequence(self.name) - self.value = value_node.as_str_list() if transform: - self.value = [transform(x) for x in self.value] + self.value = [transform(x) for x in value_node] + else: + self.value = value_node.as_str_list() self.value = sorted(self.value) self.validate(self.value, value_node) |