diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-06 09:46:00 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-06 09:46:00 -0400 |
| commit | b0d0cce064a93efcc86c4abcc38314f3188f4c72 (patch) | |
| tree | 120964f923e633a9456de782a47308a491c81100 /src/lib/Bcfg2/Client/Tools/RPMng.py | |
| parent | 913d320ee02d5e16b61a14d97b2b1111d307d0d3 (diff) | |
| download | bcfg2-b0d0cce064a93efcc86c4abcc38314f3188f4c72.tar.gz bcfg2-b0d0cce064a93efcc86c4abcc38314f3188f4c72.tar.bz2 bcfg2-b0d0cce064a93efcc86c4abcc38314f3188f4c72.zip | |
Revert "removed Bcfg2.Client.XML abstraction layer since we depend directly on lxml.etree"
This reverts commit 913d320ee02d5e16b61a14d97b2b1111d307d0d3.
Diffstat (limited to 'src/lib/Bcfg2/Client/Tools/RPMng.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/Tools/RPMng.py | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/lib/Bcfg2/Client/Tools/RPMng.py b/src/lib/Bcfg2/Client/Tools/RPMng.py index a7fbc0036..91e2180ae 100644 --- a/src/lib/Bcfg2/Client/Tools/RPMng.py +++ b/src/lib/Bcfg2/Client/Tools/RPMng.py @@ -1,9 +1,8 @@ """Bcfg2 Support for RPMS""" -import os +import os.path import rpm import rpmtools -import lxml.etree import Bcfg2.Client.Tools class RPMng(Bcfg2.Client.Tools.PkgTool): @@ -149,7 +148,7 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): instances = [inst for inst in entry if inst.tag == 'Instance' or inst.tag == 'Package'] if instances == []: # We have an old style no Instance entry. Convert it to new style. - instance = lxml.etree.SubElement(entry, 'Package') + instance = Bcfg2.Client.XML.SubElement(entry, 'Package') for attrib in list(entry.attrib.keys()): instance.attrib[attrib] = entry.attrib[attrib] if (self.pkg_checks and @@ -850,14 +849,14 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): for (name, instances) in list(self.installed.items()): if name not in packages: - extra_entry = lxml.etree.Element('Package', name=name, type=self.pkgtype) + extra_entry = Bcfg2.Client.XML.Element('Package', name=name, type=self.pkgtype) for installed_inst in instances: if self.setup['extra']: self.logger.info("Extra Package %s %s." % \ (name, self.str_evra(installed_inst))) - tmp_entry = lxml.etree.SubElement(extra_entry, 'Instance', - version = installed_inst.get('version'), - release = installed_inst.get('release')) + tmp_entry = Bcfg2.Client.XML.SubElement(extra_entry, 'Instance', \ + version = installed_inst.get('version'), \ + release = installed_inst.get('release')) if installed_inst.get('epoch', None) != None: tmp_entry.set('epoch', str(installed_inst.get('epoch'))) if installed_inst.get('arch', None) != None: @@ -874,7 +873,7 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): """ name = pkg_entry.get('name') - extra_entry = lxml.etree.Element('Package', name=name, type=self.pkgtype) + extra_entry = Bcfg2.Client.XML.Element('Package', name=name, type=self.pkgtype) instances = [inst for inst in pkg_entry if inst.tag == 'Instance' or inst.tag == 'Package'] if name in self.installOnlyPkgs: for installed_inst in installed_entry: @@ -888,9 +887,9 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): # Extra package. self.logger.info("Extra InstallOnlyPackage %s %s." % \ (name, self.str_evra(installed_inst))) - tmp_entry = lxml.etree.SubElement(extra_entry, 'Instance', - version = installed_inst.get('version'), - release = installed_inst.get('release')) + tmp_entry = Bcfg2.Client.XML.SubElement(extra_entry, 'Instance', \ + version = installed_inst.get('version'), \ + release = installed_inst.get('release')) if installed_inst.get('epoch', None) != None: tmp_entry.set('epoch', str(installed_inst.get('epoch'))) if installed_inst.get('arch', None) != None: @@ -907,9 +906,9 @@ class RPMng(Bcfg2.Client.Tools.PkgTool): if not_found: self.logger.info("Extra Normal Package Instance %s %s" % \ (name, self.str_evra(installed_inst))) - tmp_entry = lxml.etree.SubElement(extra_entry, 'Instance', - version = installed_inst.get('version'), - release = installed_inst.get('release')) + tmp_entry = Bcfg2.Client.XML.SubElement(extra_entry, 'Instance', \ + version = installed_inst.get('version'), \ + release = installed_inst.get('release')) if installed_inst.get('epoch', None) != None: tmp_entry.set('epoch', str(installed_inst.get('epoch'))) if installed_inst.get('arch', None) != None: |