diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-07-30 15:31:23 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-07-30 15:31:23 -0400 |
| commit | b0e9c203c784d26339e1b8602b0cd198951d2d72 (patch) | |
| tree | 76ff492149fd8add7d12e434f6951d282cd5730f /src | |
| parent | 712026d652db9ddd3450189ad55849532caea692 (diff) | |
| download | bcfg2-b0e9c203c784d26339e1b8602b0cd198951d2d72.tar.gz bcfg2-b0e9c203c784d26339e1b8602b0cd198951d2d72.tar.bz2 bcfg2-b0e9c203c784d26339e1b8602b0cd198951d2d72.zip | |
allow merging of undefined groups
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 6 |
1 files changed, 3 insertions, 3 deletions
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" % |