From 137f2d9d373356299ebcb8386cc0197e2143d864 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 26 Feb 2015 19:44:30 +0200 Subject: [PATCH] additional config: if param not present in data, the config is simply skipped --- src/config.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/config.py b/src/config.py index d36746f..8fac8ff 100644 --- a/src/config.py +++ b/src/config.py @@ -1501,22 +1501,28 @@ def _set_additional_config(data, camera): for name, section in sections.iteritems(): if not section.get('set'): continue + + if ('@_' + name) not in data: + continue if section.get('get_set_dict'): - set_func_values.setdefault(section['set'], {})[name] = data.get('@_' + name) + set_func_values.setdefault(section['set'], {})[name] = data['@_' + name] else: - set_func_values[section['set']] = data.get('@_' + name) + set_func_values[section['set']] = data['@_' + name] for name, config in configs.iteritems(): if not config.get('set'): continue + if ('@_' + name) not in data: + continue + if config.get('get_set_dict'): - set_func_values.setdefault(config['set'], {})[name] = data.get('@_' + name) + set_func_values.setdefault(config['set'], {})[name] = data['@_' + name] else: - set_func_values[config['set']] = data.get('@_' + name) + set_func_values[config['set']] = data['@_' + name] for func, value in set_func_values.iteritems(): func(value) -- 2.39.5