From 55aedba17f8a8ac676fe18cbdd2d4b6fef202eda Mon Sep 17 00:00:00 2001 From: Tristan Maat Date: Fri, 6 Apr 2018 12:16:52 +0000 Subject: Allow 'None' as a default_value for _yaml.node_get --- buildstream/_options/optionpool.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildstream/_options/optionpool.py') diff --git a/buildstream/_options/optionpool.py b/buildstream/_options/optionpool.py index 42b1baa9a..0bb366020 100644 --- a/buildstream/_options/optionpool.py +++ b/buildstream/_options/optionpool.py @@ -243,8 +243,8 @@ class OptionPool(): # Return true if a conditional was processed. # def _process_one_node(self, node): - conditions = _yaml.node_get(node, list, '(?)', default_value=[]) or None - assertion = _yaml.node_get(node, str, '(!)', default_value='') or None + conditions = _yaml.node_get(node, list, '(?)', default_value=None) + assertion = _yaml.node_get(node, str, '(!)', default_value=None) # Process assersions first, we want to abort on the first encountered # assertion in a given dictionary, and not lose an assertion due to -- cgit v1.2.1