summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-11-23 21:35:52 +0100
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2016-11-23 21:40:38 +0100
commitb4a27c9b3d2ebf2a143646f424f06a15e65a6cd9 (patch)
treea299c9114d9a3614bcb316d6844c0c661d00a45e /src
parent11a57fdb320a08729eb28162e2d3fcee8a2e8a2a (diff)
downloadbcfg2-b4a27c9b3d2ebf2a143646f424f06a15e65a6cd9.tar.gz
bcfg2-b4a27c9b3d2ebf2a143646f424f06a15e65a6cd9.tar.bz2
bcfg2-b4a27c9b3d2ebf2a143646f424f06a15e65a6cd9.zip
Server/Plugins/NagiosGen: Remove the list conversion
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/NagiosGen.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
index 1584a5ab6..067e2faad 100644
--- a/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
+++ b/src/lib/Bcfg2/Server/Plugins/NagiosGen.py
@@ -92,17 +92,15 @@ class NagiosGen(Plugin, Generator):
for host in host_configs:
host_data.append(open(host, 'r').read())
- group_list = ['default']
+ used_groups = set(['default'])
for line in "\n".join(host_data).splitlines():
# only include those groups which are actually used
if "hostgroup" in line:
- group_list += line.split()[1].split(',')
-
- group_list = list(set(group_list))
+ used_groups.update(line.split()[1].split(','))
for group in group_configs:
group_name = re.sub("(-group.cfg|.*/(?=[^/]+))", "", group)
- if group_name in group_list:
+ if group_name in used_groups:
groupfile = open(group, 'r')
group_data.append(groupfile.read())
groupfile.close()