Merge branch 'options-rewrite'

Conflicts:
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Init.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/BuiltinCore.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/MultiprocessingCore.py
	src/lib/Bcfg2/Server/Plugin/base.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
	src/lib/Bcfg2/Server/SSLServer.py
	src/lib/Bcfg2/Utils.py
	src/lib/Bcfg2/settings.py
	src/sbin/bcfg2-crypt
	src/sbin/bcfg2-info
	src/sbin/bcfg2-lint
	src/sbin/bcfg2-test
	src/sbin/bcfg2-yum-helper
	tools/bcfg2-profile-templates.py

1 files changed, 0 insertions, 44 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
index 293ec8e1a..c85bc7d41 100644
--- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
+++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py
@@ -1,12 +1,9 @@
 '''This module implements a package management scheme for all images'''
 
-import os
 import re
 import sys
-import glob
 import logging
 import lxml.etree
-import Bcfg2.Server.Lint
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugin import PluginExecutionError
 
@@ -295,44 +292,3 @@ class Pkgmgr(Bcfg2.Server.Plugin.PrioDir):
 
     def HandleEntry(self, entry, metadata):
         self.BindEntry(entry, metadata)
-
-
-class PkgmgrLint(Bcfg2.Server.Lint.ServerlessPlugin):
-    """ Find duplicate :ref:`Pkgmgr
-    <server-plugins-generators-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"}