From fbfd6bb0d6bc5c0b6660233269d8aabb13da49ea Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 25 Jan 2012 09:56:48 -0500 Subject: fixed Pkgmgr bcfg2-lint plugin (#1082) --- src/lib/Server/Lint/Pkgmgr.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/lib/Server/Lint/Pkgmgr.py') diff --git a/src/lib/Server/Lint/Pkgmgr.py b/src/lib/Server/Lint/Pkgmgr.py index 3960a8cf9..8f099163a 100644 --- a/src/lib/Server/Lint/Pkgmgr.py +++ b/src/lib/Server/Lint/Pkgmgr.py @@ -1,21 +1,19 @@ +import glob +import lxml.etree import Bcfg2.Server.Lint -class Pkgmgr(Bcfg2.Server.Lint.ServerPlugin): +class Pkgmgr(Bcfg2.Server.Lint.ServerlessPlugin): """ find duplicate Pkgmgr entries with the same priority """ def Run(self): - if 'Pkgmgr' not in self.core.plugins: - self.logger.info("Pkgmgr server plugin is not enabled, skipping Pkgmgr lint checks") - return - pset = set() - for plist in self.core.plugins['Pkgmgr'].entries.values(): - if self.HandlesFile(plist.name): - xdata = plist.data + for pfile in glob.glob("%s/Pkgmgr/*.xml" % self.config['repo']): + if self.HandlesFile(pfile): + xdata = lxml.etree.parse(pfile).getroot() # get priority, type, group - priority = xdata.getroot().get('priority') - ptype = xdata.getroot().get('type') - for pkg in xdata.findall("//Package"): + priority = xdata.get('priority') + ptype = xdata.get('type') + for pkg in xdata.xpath("//Package"): if pkg.getparent().tag == 'Group': grp = pkg.getparent().get('name') if (type(grp) is not str and -- cgit v1.2.3-1-g7c22