From e81dce803aaa6b904d092452f574099d03bdae99 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Fri, 9 Dec 2011 15:51:57 -0500 Subject: Don't do duplicate work while matching bundle entries --- src/lib/Server/Plugins/Bundler.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py index 04aa3df71..418e47bcb 100644 --- a/src/lib/Server/Plugins/Bundler.py +++ b/src/lib/Server/Plugins/Bundler.py @@ -75,9 +75,13 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, def BuildStructures(self, metadata): """Build all structures for client (metadata).""" bundleset = [] + + bundle_entries = {} + for key, item in self.entries.items(): + bundle_entries.setdefault(self.patterns.match(os.path.basename(key)).group('name'), []).append(item) + for bundlename in metadata.bundles: - entries = [item for (key, item) in self.entries.items() if \ - self.patterns.match(os.path.basename(key)).group('name') == bundlename] + entries = bundle_entries[bundlename] if len(entries) == 0: continue elif len(entries) == 1: -- cgit v1.2.3-1-g7c22