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/_loader.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/_loader.py')
| -rw-r--r-- | buildstream/_loader.py | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/buildstream/_loader.py b/buildstream/_loader.py index 6d384ae2c..44f38e3f1 100644 --- a/buildstream/_loader.py +++ b/buildstream/_loader.py @@ -155,9 +155,9 @@ def extract_depends_from_node(data): elif isinstance(dep, Mapping): _yaml.node_validate(dep, ['filename', 'type', 'junction']) - # Make type optional, for this we set it to None after - dep_type = _yaml.node_get(dep, str, Symbol.TYPE, default_value="") - if not dep_type or dep_type == Symbol.ALL: + # Make type optional, for this we set it to None + dep_type = _yaml.node_get(dep, str, Symbol.TYPE, default_value=None) + if dep_type is None or dep_type == Symbol.ALL: dep_type = None elif dep_type not in [Symbol.BUILD, Symbol.RUNTIME]: provenance = _yaml.node_get_provenance(dep, key=Symbol.TYPE) @@ -167,9 +167,7 @@ def extract_depends_from_node(data): filename = _yaml.node_get(dep, str, Symbol.FILENAME) - junction = _yaml.node_get(dep, str, Symbol.JUNCTION, default_value="") - if not junction: - junction = None + junction = _yaml.node_get(dep, str, Symbol.JUNCTION, default_value=None) dependency = Dependency(filename, dep_type=dep_type, junction=junction, @@ -584,11 +582,9 @@ class Loader(): del source[Symbol.KIND] # Directory is optional - directory = _yaml.node_get(source, str, Symbol.DIRECTORY, default_value='') + directory = _yaml.node_get(source, str, Symbol.DIRECTORY, default_value=None) if directory: del source[Symbol.DIRECTORY] - else: - directory = None index = sources.index(source) meta_source = MetaSource(element_name, index, kind, source, directory) |