From e442ab4e4e9f5ddb8472cedec217bd3d76276f04 Mon Sep 17 00:00:00 2001 From: Matthew Wall Date: Sun, 23 Nov 2014 14:23:04 +0000 Subject: [PATCH] ensure that extension installer does not append service name multiple times --- setup.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 7c688862..8d7e7f61 100755 --- a/setup.py +++ b/setup.py @@ -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)