Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugins/GroupLogic.py

1 files changed, 9 insertions, 2 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
index e8e0ab840..1da7c8fec 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
@@ -4,6 +4,7 @@ template to dynamically set additional groups for clients. """
 import os
 import lxml.etree
 import Bcfg2.Server.Plugin
+from Bcfg2.Server.Plugins.Metadata import MetadataGroup
 
 
 class GroupLogicConfig(Bcfg2.Server.Plugin.StructFile):
@@ -37,5 +38,11 @@ class GroupLogic(Bcfg2.Server.Plugin.Plugin,
                                        should_monitor=True)
 
     def get_additional_groups(self, metadata):
-        return [el.get("name")
-                for el in self.config.XMLMatch(metadata).findall("Group")]
+        rv = []
+        for el in self.config.XMLMatch(metadata).findall("Group"):
+            if el.get("category"):
+                rv.append(MetadataGroup(el.get("name"),
+                                        category=el.get("category")))
+            else:
+                rv.append(el.get("name"))
+        return rv