summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-05 09:25:53 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-09-05 09:25:53 -0400
commit9fa2293c0bdd71215bc24e371dbd59f0cf922d94 (patch)
treedd1960586a7279c50fd0afe8957abf490bb2919b /src
parent78acdcfcdb305e7c20e88855385ab5a3534724c5 (diff)
downloadbcfg2-9fa2293c0bdd71215bc24e371dbd59f0cf922d94.tar.gz
bcfg2-9fa2293c0bdd71215bc24e371dbd59f0cf922d94.tar.bz2
bcfg2-9fa2293c0bdd71215bc24e371dbd59f0cf922d94.zip
GroupLogic: fixed for 1.4
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/GroupLogic.py11
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 aa336ff23..e8e0ab840 100644
--- a/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
+++ b/src/lib/Bcfg2/Server/Plugins/GroupLogic.py
@@ -11,10 +11,17 @@ class GroupLogicConfig(Bcfg2.Server.Plugin.StructFile):
create = lxml.etree.Element("GroupLogic",
nsmap=dict(py="http://genshi.edgewall.org/"))
- def _match(self, item, metadata):
+ def _match(self, item, metadata, *args):
if item.tag == 'Group' and not len(item.getchildren()):
return [item]
- return Bcfg2.Server.Plugin.StructFile._match(self, item, metadata)
+ return Bcfg2.Server.Plugin.StructFile._match(self, item, metadata,
+ *args)
+
+ def _xml_match(self, item, metadata, *args):
+ if item.tag == 'Group' and not len(item.getchildren()):
+ return [item]
+ return Bcfg2.Server.Plugin.StructFile._xml_match(self, item, metadata,
+ *args)
class GroupLogic(Bcfg2.Server.Plugin.Plugin,