Psion-fanatic/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

Include should occur only once in the file

Browse source
This commit is contained in:
Fabio Manganiello 2018-01-08 10:20:32 +01:00
parent 7963b5e11f
commit ed28a2c3ec
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
platypush/config/__init__.py
View file

@ -74,10 +74,14 @@ class Config(object):
for section in file_config:
if section == 'include':
included_config = self._read_config_file(file_config[section])
include_files = file_config[section] \
if isinstance(file_config[section], list) \
else [file_config[section]]
for incl_section in included_config.keys():
config[incl_section] = included_config[incl_section]
for include_file in include_files:
included_config = self._read_config_file(include_file)
for incl_section in included_config.keys():
config[incl_section] = included_config[incl_section]
elif 'disabled' not in file_config[section] \
or file_config[section]['disabled'] is False:
config[section] = file_config[section]