diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-10-13 12:01:34 +0100 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-10-13 12:01:35 +0100 |
| commit | 58fc5628c4fdb6911b3ea57cdc8e0ad7790dd447 (patch) | |
| tree | 0088141d361c5c906855aa8d147bc7a327b7ef24 | |
| parent | 58a1dd4ba9aef43a47d7dd24deee6eb9e9e45b30 (diff) | |
| download | buildstream-jonathan/all-elements-need-yaml.tar.gz | |
Make all element loading require a yaml filejonathan/all-elements-need-yaml
Every element should have an accompanying .yaml file, if not for
defaults then for documentation.
| -rw-r--r-- | buildstream/element.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/buildstream/element.py b/buildstream/element.py index 05c92aa19..17c553946 100644 --- a/buildstream/element.py +++ b/buildstream/element.py @@ -1448,13 +1448,8 @@ class Element(Plugin): # if not self.__defaults_set: - # Load the plugin's accompanying .yaml file if one was provided - defaults = {} - try: - defaults = _yaml.load(plugin_conf, os.path.basename(plugin_conf)) - except LoadError as e: - if e.reason != LoadErrorReason.MISSING_FILE: - raise e + # Load the plugin's accompanying .yaml file. Plugins must have a .yaml file. + defaults = _yaml.load(plugin_conf, os.path.basename(plugin_conf)) # Special case; compose any element-wide split-rules declarations self.__compose_default_splits(defaults) |