mirror/weewx
1
0
Fork 0
mirror of https://github.com/weewx/weewx.git synced 2026-06-10 01:55:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

ensure that extension installer does not append service name multiple times

Browse Source
This commit is contained in:
Matthew Wall
2014-11-23 14:23:04 +00:00
parent 672a412fd4
commit e442ab4e4e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@@ -1343,12 +1343,14 @@ class ExtensionInstaller(Logger):
# so do a conditional merge instead.
conditional_merge(config, cfg)
# append services to appropriate lists
# append services to appropriate lists...
for sg in all_service_groups:
for s in self.services[sg]:
if not isinstance(config['Engine']['Services'][sg], list):
config['Engine']['Services'][sg] = [config['Engine']['Services'][sg]]
config['Engine']['Services'][sg].append(s)
# ...but only if not already there
if s not in config['Engine']['Services'][sg]:
config['Engine']['Services'][sg].append(s)
self.log("merged configuration:", level=3)
self.log('\n'.join(formatdict(config)), level=3)