1 files changed, 50 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
index e9254cdcc..7dac907e1 100644
--- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
+++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
@@ -1,12 +1,17 @@
 '''This module implements a package management scheme for all images'''
 
-import logging
+import os
 import re
+import glob
+import logging
+import lxml.etree
 import Bcfg2.Server.Plugin
-import lxml
+import Bcfg2.Server.Lint
+
 try:
     set
 except NameError:
+    # deprecated since python 2.6
     from sets import Set as set
 
 logger = logging.getLogger('Bcfg2.Plugins.Pkgmgr')
@@ -24,12 +29,14 @@ class FuzzyDict(dict):
             print("got non-string key %s" % str(key))
         return dict.__getitem__(self, key)
 
-    def has_key(self, key):
+    def __contains__(self, key):
         if isinstance(key, str):
             mdata = self.fuzzy.match(key)
-            if self.fuzzy.match(key):
-                return dict.has_key(self, mdata.groupdict()['name'])
-        return dict.has_key(self, key)
+            if mdata:
+                return dict.__contains__(self, mdata.groupdict()['name'])
+        else:
+            print("got non-string key %s" % str(key))
+        return dict.__contains__(self, key)
 
     def get(self, key, default=None):
         try:
@@ -167,3 +174,40 @@ class Pkgmgr(Bcfg2.Server.Plugin.PrioDir):
 
     def HandleEntry(self, entry, metadata):
         self.BindEntry(entry, metadata)
+
+
+class PkgmgrLint(Bcfg2.Server.Lint.ServerlessPlugin):
+    """ find duplicate Pkgmgr entries with the same priority """
+    def Run(self):
+        pset = set()
+        for pfile in glob.glob(os.path.join(self.config['repo'], 'Pkgmgr',
+                                            '*.xml')):
+            if self.HandlesFile(pfile):
+                xdata = lxml.etree.parse(pfile).getroot()
+                # get priority, type, group
+                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
+                            grp.getparent().tag == 'Group'):
+                            pgrp = grp.getparent().get('name')
+                        else:
+                            pgrp = 'none'
+                    else:
+                        grp = 'none'
+                        pgrp = 'none'
+                    ptuple = (pkg.get('name'), priority, ptype, grp, pgrp)
+                    # check if package is already listed with same
+                    # priority, type, grp
+                    if ptuple in pset:
+                        self.LintError("duplicate-package",
+                                       "Duplicate Package %s, priority:%s, type:%s" %
+                                         (pkg.get('name'), priority, ptype))
+                    else:
+                        pset.add(ptuple)
+    
+    @classmethod
+    def Errors(cls):
+        return {"duplicate-packages":"error"}