ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2433 from theotherjimmy/better-config-errors 

[tools] Improve error for missing name from mbed_lib.json
pull/2266/merge
Martin Kojtal 2016-08-15 15:15:06 +01:00 committed by GitHub
parent 6c2ef92dfa 71113a8820
commit dd8060b798
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/config.py
View File

@ -240,6 +240,9 @@ class Config:
# Read the library configuration and add a "__full_config_path" attribute to it # Read the library configuration and add a "__full_config_path" attribute to it
cfg = json_file_to_dict(f) cfg = json_file_to_dict(f)
cfg["__config_path"] = full_path cfg["__config_path"] = full_path
if "name" not in cfg:
raise ConfigException("Library configured at %s has no name field." % full_path)
# If there's already a configuration for a module with the same name, exit with error # If there's already a configuration for a module with the same name, exit with error
if self.lib_config_data.has_key(cfg["name"]): if self.lib_config_data.has_key(cfg["name"]):
raise ConfigException("Library name '%s' is not unique (defined in '%s' and '%s')" % (cfg["name"], full_path, self.lib_config_data[cfg["name"]]["__config_path"])) raise ConfigException("Library name '%s' is not unique (defined in '%s' and '%s')" % (cfg["name"], full_path, self.lib_config_data[cfg["name"]]["__config_path"]))