diff options
| author | Tim Laszlo <tim.laszlo@gmail.com> | 2011-02-02 20:04:04 -0600 |
|---|---|---|
| committer | Tim Laszlo <tim.laszlo@gmail.com> | 2011-02-10 15:56:46 -0600 |
| commit | 14a502c0026051457b227b28e8d1e7c8a0db4ba4 (patch) | |
| tree | 24c57366edbc82d1b617d21c6842a27943858710 /src/lib/Server/Plugins/Metadata.py | |
| parent | 521f8a1714378021a694d2b312b0281d3abf3ef7 (diff) | |
| download | bcfg2-14a502c0026051457b227b28e8d1e7c8a0db4ba4.tar.gz bcfg2-14a502c0026051457b227b28e8d1e7c8a0db4ba4.tar.bz2 bcfg2-14a502c0026051457b227b28e8d1e7c8a0db4ba4.zip | |
Metadata: Move group routines to new class
Diffstat (limited to 'src/lib/Server/Plugins/Metadata.py')
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 36ff4ee85..aa482e7ed 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -287,7 +287,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, raise MetadataConsistencyError element = lxml.etree.SubElement(self.groups_xml.base_xdata.getroot(), - "group", name=group_name) + "Group", name=group_name) for key, val in attribs.iteritems(): element.set(key, val) self.groups_xml.write() @@ -295,8 +295,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def update_group(self, group_name, attribs): """Update a groups attributes.""" node = self.search_group(group_name, self.groups_xml.xdata) - if node != None: - self.logger.error("Group \"%s\" already exists" % (group_name)) + if node == None: + self.logger.error("Group \"%s\" does not exist" % (group_name)) raise MetadataConsistencyError xdict = self.groups_xml.find_xml_for_xpath('.//Group[@name="%s"]' % (node.get('name'))) if not xdict: @@ -310,14 +310,14 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def remove_group(self, group_name): """Remove a group.""" node = self.search_group(group_name, self.groups_xml.xdata) - if node != None: - self.logger.error("Group \"%s\" already exists" % (group_name)) + if node == None: + self.logger.error("Group \"%s\" does not exist" % (group_name)) raise MetadataConsistencyError xdict = self.groups_xml.find_xml_for_xpath('.//Group[@name="%s"]' % (node.get('name'))) if not xdict: self.logger.error("Unexpected error finding group") raise MetadataConsistencyError - xdict['xmltree'].remove(xdict['xquery'][0]) + xdict['xquery'][0].getparent().remove(xdict['xquery'][0]) self.groups_xml.write_xml(xdict['filename'], xdict['xmltree']) def add_bundle(self, bundle_name): |