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

Allow an empty or mal-formed config to be passed to the config system

pull/2575/head
Jimmy Brisson 2016-08-29 09:54:56 -05:00
parent 22acfbf077
commit c7bf3fac60
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/config.py
View File

@ -15,10 +15,12 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
""" """
import os
import sys
# Implementation of mbed configuration mechanism # Implementation of mbed configuration mechanism
from tools.utils import json_file_to_dict from tools.utils import json_file_to_dict
from tools.targets import Target from tools.targets import Target
import os
# Base class for all configuration exceptions # Base class for all configuration exceptions
class ConfigException(Exception): class ConfigException(Exception):
@ -376,8 +378,12 @@ class Config(object):
app_config_location, full_path)) app_config_location, full_path))
else: else:
app_config_location = full_path app_config_location = full_path
self.app_config_data = json_file_to_dict(app_config_location) \ try:
if app_config_location else {} self.app_config_data = json_file_to_dict(app_config_location) \
if app_config_location else {}
except ValueError as exc:
sys.stderr.write(str(exc) + "\n")
self.app_config_data = {}
# Check the keys in the application configuration data # Check the keys in the application configuration data
unknown_keys = set(self.app_config_data.keys()) - \ unknown_keys = set(self.app_config_data.keys()) - \
self.__allowed_keys["application"] self.__allowed_keys["application"]
@ -419,7 +425,12 @@ class Config(object):
self.processed_configs[full_path] = True self.processed_configs[full_path] = True
# Read the library configuration and add a "__full_config_path" # Read the library configuration and add a "__full_config_path"
# attribute to it # attribute to it
cfg = json_file_to_dict(config_file) try:
cfg = json_file_to_dict(config_file)
except ValueError as exc:
sys.stderr.write(str(exc) + "\n")
continue
cfg["__config_path"] = full_path cfg["__config_path"] = full_path
if "name" not in cfg: if "name" not in cfg: