From b0e9c203c784d26339e1b8602b0cd198951d2d72 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 30 Jul 2012 15:31:23 -0400 Subject: allow merging of undefined groups --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 447a7cd05..5dcaa8bdb 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -858,10 +858,10 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def merge_additional_groups(self, imd, groups): for group in groups: - if group in imd.groups or group not in self.groups: + if group in imd.groups: continue - category = self.groups[group].category - if category: + if group in self.groups and self.groups[group].category: + category = self.groups[group].category if self.groups[group].category in imd.categories: self.logger.warning("%s: Group %s suppressed by category " "%s; %s already a member of %s" % -- cgit v1.2.3-1-g7c22