Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Tools/YUM.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Admin/Perf.py
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Admin/__init__.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/FileMonitor/Fam.py
	src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Base.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
	src/lib/Bcfg2/Server/Plugins/Cvs.py
	src/lib/Bcfg2/Server/Plugins/Darcs.py
	src/lib/Bcfg2/Server/Plugins/Decisions.py
	src/lib/Bcfg2/Server/Plugins/FileProbes.py
	src/lib/Bcfg2/Server/Plugins/Fossil.py
	src/lib/Bcfg2/Server/Plugins/Git.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/Plugins/NagiosGen.py
	src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
	src/lib/Bcfg2/Server/Plugins/Packages/Source.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
	src/lib/Bcfg2/Server/Plugins/Properties.py
	src/lib/Bcfg2/Server/Plugins/__init__.py
	src/lib/Bcfg2/Server/__init__.py
	src/sbin/bcfg2-build-reports
	src/sbin/bcfg2-crypt
	testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py

2 files changed, 35 insertions, 23 deletions

diff --git a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
index 497e8fac6..7a2fd3fe9 100644
--- a/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
+++ b/src/lib/Bcfg2/Server/Lint/RequiredAttrs.py
@@ -4,9 +4,14 @@ verified with an XML schema alone"""
 import os
 import re
 import Bcfg2.Server.Lint
-import Bcfg2.Client.Tools.POSIX
 import Bcfg2.Client.Tools.VCS
 from Bcfg2.Server.Plugins.Packages import Apt, Yum
+from Bcfg2.Client.Tools.POSIX.base import device_map
+try:
+    from Bcfg2.Server.Plugins.Bundler import BundleTemplateFile
+    HAS_GENSHI = True
+except ImportError:
+    HAS_GENSHI = False
 
 
 # format verifying functions
@@ -53,10 +58,10 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
         Bcfg2.Server.Lint.ServerPlugin.__init__(self, *args, **kwargs)
         self.required_attrs = dict(
             Path=dict(
-                device=dict(name=is_filename, owner=is_username,
+                device=dict(name=is_filename,
+                            owner=is_username,
                             group=is_username,
-                            dev_type=lambda v: \
-                                v in Bcfg2.Client.Tools.POSIX.base.device_map),
+                            dev_type=lambda v: v in device_map),
                 directory=dict(name=is_filename, owner=is_username,
                                group=is_username, mode=is_octal_mode),
                 file=dict(name=is_filename, owner=is_username,
@@ -81,21 +86,21 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
                                command=None)},
             ACL=dict(
                 default=dict(scope=lambda v: v in ['user', 'group'],
-                             perms=lambda v: re.match('^([0-7]|[rwx\-]{0,3}',
+                             perms=lambda v: re.match(r'^([0-7]|[rwx\-]{0,3}',
                                                       v)),
                 access=dict(scope=lambda v: v in ['user', 'group'],
-                            perms=lambda v: re.match('^([0-7]|[rwx\-]{0,3}',
+                            perms=lambda v: re.match(r'^([0-7]|[rwx\-]{0,3}',
                                                      v)),
-                mask=dict(perms=lambda v: re.match('^([0-7]|[rwx\-]{0,3}',
+                mask=dict(perms=lambda v: re.match(r'^([0-7]|[rwx\-]{0,3}',
                                                    v))),
             Package={"__any__": dict(name=None)},
             SEBoolean={None: dict(name=None,
                                   value=lambda v: v in ['on', 'off'])},
             SEModule={None: dict(name=None, __text__=None)},
-            SEPort={None:
-                        dict(name=lambda v: re.match(r'^\d+(-\d+)?/(tcp|udp)',
-                                                     v),
-                             selinuxtype=is_selinux_type)},
+            SEPort={
+                None: dict(name=lambda v: re.match(r'^\d+(-\d+)?/(tcp|udp)',
+                                                   v),
+                           selinuxtype=is_selinux_type)},
             SEFcontext={None: dict(name=None, selinuxtype=is_selinux_type)},
             SENode={None: dict(name=lambda v: "/" in v,
                                selinuxtype=is_selinux_type,
@@ -110,8 +115,7 @@ class RequiredAttrs(Bcfg2.Server.Lint.ServerPlugin):
             SEPermissive={None: dict(name=is_selinux_type)},
             POSIXGroup={None: dict(name=is_username)},
             POSIXUser={None: dict(name=is_username)},
-            MemberOf={None: dict(__text__=is_username)},
-            )
+            MemberOf={None: dict(__text__=is_username)})
 
     def Run(self):
         self.check_packages()
diff --git a/src/lib/Bcfg2/Server/Lint/Validate.py b/src/lib/Bcfg2/Server/Lint/Validate.py
index dd45ac62e..946ef8270 100644
--- a/src/lib/Bcfg2/Server/Lint/Validate.py
+++ b/src/lib/Bcfg2/Server/Lint/Validate.py
@@ -39,7 +39,8 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
              "NagiosGen/config.xml": "nagiosgen.xsd",
              "FileProbes/config.xml": "fileprobes.xsd",
              "SSLCA/**/cert.xml": "sslca-cert.xsd",
-             "SSLCA/**/key.xml": "sslca-key.xsd"
+             "SSLCA/**/key.xml": "sslca-key.xsd",
+             "GroupLogic/groups.xml": "grouplogic.xsd"
              }
 
         self.filelists = {}
@@ -83,17 +84,15 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
             else:
                 self.LintError("properties-schema-not-found",
                                "No schema found for %s" % filename)
+                # ensure that it at least parses
+                self.parse(filename)
 
-    def validate(self, filename, schemafile, schema=None):
-        """validate a file against the given lxml.etree.Schema.
-        return True on success, False on failure """
-        if schema is None:
-            # if no schema object was provided, instantiate one
-            schema = self._load_schema(schemafile)
-            if not schema:
-                return False
+    def parse(self, filename):
+        """ Parse an XML file, raising the appropriate LintErrors if
+        it can't be parsed or read.  Return the
+        lxml.etree._ElementTree parsed from the file. """
         try:
-            datafile = lxml.etree.parse(filename)
+            return lxml.etree.parse(filename)
         except SyntaxError:
             result = self.cmd.run(["xmllint", filename])
             self.LintError("xml-failed-to-parse",
@@ -105,6 +104,15 @@ class Validate(Bcfg2.Server.Lint.ServerlessPlugin):
                            "Failed to open file %s" % filename)
             return False
 
+    def validate(self, filename, schemafile, schema=None):
+        """validate a file against the given lxml.etree.Schema.
+        return True on success, False on failure """
+        if schema is None:
+            # if no schema object was provided, instantiate one
+            schema = self._load_schema(schemafile)
+            if not schema:
+                return False
+        datafile = self.parse(filename)
         if not schema.validate(datafile):
             cmd = ["xmllint"]
             if self.files is None: