From 695eddc069c9803eca5d004e80ca7be7defdd20c Mon Sep 17 00:00:00 2001 From: Benjamin Schubert Date: Fri, 5 Jul 2019 17:59:15 +0100 Subject: _yaml: rework 'assert_symbol_names' to not require provenance Now that we get scalar Nodes, it is easier to just give the node and extract the provenance as needed. --- src/buildstream/_options/option.py | 3 +-- src/buildstream/_options/optionpool.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/buildstream/_options') diff --git a/src/buildstream/_options/option.py b/src/buildstream/_options/option.py index 8fe0cbad6..ae5d56beb 100644 --- a/src/buildstream/_options/option.py +++ b/src/buildstream/_options/option.py @@ -66,8 +66,7 @@ class Option(): # Assert valid symbol name for variable name if self.variable is not None: - p = _yaml.node_get_provenance(node, 'variable') - _yaml.assert_symbol_name(p, self.variable, 'variable name') + _yaml.assert_symbol_name(self.variable, 'variable name', ref_node=node.get_node('variable')) # load_value() # diff --git a/src/buildstream/_options/optionpool.py b/src/buildstream/_options/optionpool.py index f695c0acf..cd4bfb6dc 100644 --- a/src/buildstream/_options/optionpool.py +++ b/src/buildstream/_options/optionpool.py @@ -68,8 +68,7 @@ class OptionPool(): for option_name, option_definition in options.items(): # Assert that the option name is a valid symbol - p = _yaml.node_get_provenance(options, option_name) - _yaml.assert_symbol_name(p, option_name, "option name", allow_dashes=False) + _yaml.assert_symbol_name(option_name, "option name", ref_node=option_definition, allow_dashes=False) opt_type_name = option_definition.get_str('type') try: -- cgit v1.2.1