diff options
| author | Tristan Maat <tm@tlater.net> | 2018-04-06 12:16:52 +0000 |
|---|---|---|
| committer | Tristan Maat <tm@tlater.net> | 2018-04-06 15:01:14 +0000 |
| commit | 55aedba17f8a8ac676fe18cbdd2d4b6fef202eda (patch) | |
| tree | 584f4a40d8a64f656f5a4209403e17d899d1d9a7 /buildstream/_options/optionpool.py | |
| parent | 23edfe5d961136c2a22fd4c0939bb9dc0e9e3a14 (diff) | |
| download | buildstream-node-get-default.tar.gz | |
Allow 'None' as a default_value for _yaml.node_getnode-get-default
Diffstat (limited to 'buildstream/_options/optionpool.py')
| -rw-r--r-- | buildstream/_options/optionpool.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |