Merge branch 'maint'

Conflicts:
	doc/appendix/guides/centos.txt
	doc/server/plugins/grouping/metadata.txt
	setup.py
	src/lib/Bcfg2/Client/Frame.py
	src/lib/Bcfg2/Client/Proxy.py
	src/lib/Bcfg2/Server/Lint/Genshi.py
	src/lib/Bcfg2/Server/Lint/Validate.py
	src/lib/Bcfg2/Server/Plugins/Bundler.py
	src/lib/Bcfg2/Server/Plugins/SSHbase.py
	src/sbin/bcfg2-lint

8 files changed, 44 insertions, 27 deletions

diff --git a/src/lib/Bcfg2/Client/Frame.py b/src/lib/Bcfg2/Client/Frame.py
index 11a82fcc0..b24b46dbc 100644
--- a/src/lib/Bcfg2/Client/Frame.py
+++ b/src/lib/Bcfg2/Client/Frame.py
@@ -161,7 +161,7 @@ class Frame(object):
     def promptFilter(self, msg, entries):
         """Filter a supplied list based on user input."""
         ret = []
-        entries.sort(cmpent)
+        entries.sort(key=lambda e: e.tag + ":" + e.get('name'))
         for entry in entries[:]:
             if entry in self.unhandled:
                 # don't prompt for entries that can't be installed
@@ -427,10 +427,12 @@ class Frame(object):
                 # prune out unspecified bundles when running with -b
                 continue
             if bundle in mbundles:
-                self.logger.debug("Bundle %s was modified" % bundle)
+                self.logger.debug("Bundle %s was modified" %
+                                  bundle.get('name'))
                 func = "BundleUpdated"
             else:
-                self.logger.debug("Bundle %s was not modified" % bundle)
+                self.logger.debug("Bundle %s was not modified" %
+                                  bundle.get('name'))
                 func = "BundleNotUpdated"
             for tool in self.tools:
                 try:
@@ -477,8 +479,8 @@ class Frame(object):
                         self.logger.info("%s:%s:%s" % (entry.tag, etype,
                                                        entry.get('name')))
                     else:
-                        self.logger.info("    %s:%s" % (entry.tag,
-                                                        entry.get('name')))
+                        self.logger.info("%s:%s" % (entry.tag,
+                                                    entry.get('name')))
         self.logger.info('Total managed entries:  %d' %
                          len(list(self.states.values())))
         self.logger.info('Unmanaged entries:      %d' % len(self.extra))
@@ -490,8 +492,8 @@ class Frame(object):
                     self.logger.info("%s:%s:%s" % (entry.tag, etype,
                                                    entry.get('name')))
                 else:
-                    self.logger.info("    %s:%s" % (entry.tag,
-                                                    entry.get('name')))
+                    self.logger.info("%s:%s" % (entry.tag,
+                                                entry.get('name')))
 
         if ((list(self.states.values()).count(False) == 0) and not self.extra):
             self.logger.info('All entries correct.')
diff --git a/src/lib/Bcfg2/Client/Proxy.py b/src/lib/Bcfg2/Client/Proxy.py
index 57be34369..eda3a7fce 100644
--- a/src/lib/Bcfg2/Client/Proxy.py
+++ b/src/lib/Bcfg2/Client/Proxy.py
@@ -24,6 +24,7 @@ from Bcfg2.Compat import httplib, xmlrpclib, urlparse, quote_plus
 
 version = sys.version_info[:2]
 has_py26 = version >= (2, 6)
+has_py32 = version >= (3, 2)
 
 __all__ = ["ComponentProxy",
            "RetryMethod",
@@ -171,11 +172,14 @@ class SSLHTTPConnection(httplib.HTTPConnection):
         """
         if not has_py26:
             httplib.HTTPConnection.__init__(self, host, port, strict)
-        else:
+        elif not has_py32:
             httplib.HTTPConnection.__init__(self, host, port, strict, timeout)
+        else:
+            # the strict parameter is deprecated.
+            # HTTP 0.9-style "Simple Responses" are not supported anymore.
+            httplib.HTTPConnection.__init__(self, host, port, timeout=timeout)
         self.logger = logging.getLogger("%s.%s" % (self.__class__.__module__,
                                                    self.__class__.__name__))
-
         self.key = key
         self.cert = cert
         self.ca = ca
diff --git a/src/lib/Bcfg2/Client/Tools/Chkconfig.py b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
index ec7f462b3..c3dcf7796 100644
--- a/src/lib/Bcfg2/Client/Tools/Chkconfig.py
+++ b/src/lib/Bcfg2/Client/Tools/Chkconfig.py
@@ -65,16 +65,19 @@ class Chkconfig(Bcfg2.Client.Tools.SvcTool):
         self.cmd.run("/sbin/chkconfig --add %s" % (entry.attrib['name']))
         self.logger.info("Installing Service %s" % (entry.get('name')))
         rv = True
-        if entry.get('status') == 'off':
+        if (entry.get('status') == 'off' or
+            self.setup["servicemode"] == "build"):
             rv &= self.cmd.run((rcmd + " --level 0123456") %
                                (entry.get('name'),
                                 entry.get('status'))).success
-            if entry.get("current_status") == "on":
+            if entry.get("current_status") == "on" and \
+               self.setup["servicemode"] != "disabled":
                 rv &= self.stop_service(entry).success
         else:
             rv &= self.cmd.run(rcmd % (entry.get('name'),
                                        entry.get('status'))).success
-            if entry.get("current_status") == "off":
+            if entry.get("current_status") == "off" and \
+               self.setup["servicemode"] != "disabled":
                 rv &= self.start_service(entry).success
         return rv
 
diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
index 8ba1944d8..8f6bc5f37 100644
--- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
+++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py
@@ -154,7 +154,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
         if entry.get("current_exists", "true") == "true":
             # verify supplemental groups
             actual = [g[0] for g in self.user_supplementary_groups(entry)]
-            expected = [e.text for e in entry.findall("MemberOf")]
+            expected = [e.get("group", e.text).strip()
+                        for e in entry.findall("MemberOf")]
             if set(expected) != set(actual):
                 entry.set('qtext',
                           "\n".join([entry.get('qtext', '')] +
@@ -254,7 +255,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool):
                 if entry.get('uid'):
                     cmd.extend(['-u', entry.get('uid')])
                 cmd.extend(['-g', entry.get('group')])
-                extras = [e.text for e in entry.findall("MemberOf")]
+                extras = [e.get("group", e.text).strip()
+                          for e in entry.findall("MemberOf")]
                 if extras:
                     cmd.extend(['-G', ",".join(extras)])
                 cmd.extend(['-d', entry.get('home')])
diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 5e319a414..e52da081b 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -73,10 +73,10 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
 
                 self.logger.debug('Running equery check on %s' %
                                   entry.get('name'))
-                for line in self.cmd.run(["/usr/bin/equery", "-N", "check",
-                                          '=%s-%s' %
-                                          (entry.get('name'),
-                                           version)]).stdout.splitlines():
+                for line in self.cmd.run(
+                    ["/usr/bin/equery", "-N", "check",
+                     '=%s-%s' % (entry.get('name'),
+                                 entry.get('version'))]).stdout.splitlines():
                     if '!!!' in line and line.split()[1] not in modlist:
                         return False
 
diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index f38615062..92572ef1d 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -492,7 +492,8 @@ class SELinuxSeportHandler(SELinuxEntryHandler):
     def _defaultargs(self, entry):
         """ argument list for adding and modifying entries """
         (port, proto) = entry.get("name").split("/")
-        return (port, proto, '', entry.get("selinuxtype"))
+        return (port, proto, entry.get("mlsrange", ""),
+                entry.get("selinuxtype"))
 
     def _deleteargs(self, entry):
         return tuple(entry.get("name").split("/"))
@@ -565,7 +566,7 @@ class SELinuxSefcontextHandler(SELinuxEntryHandler):
         """ argument list for adding, modifying, and deleting entries """
         return (entry.get("name"), entry.get("selinuxtype"),
                 self.filetypeargs[entry.get("filetype", "all")],
-                '', '')
+                entry.get("mlsrange", ""), '')
 
     def primarykey(self, entry):
         return ":".join([entry.tag, entry.get("name"),
@@ -600,7 +601,7 @@ class SELinuxSenodeHandler(SELinuxEntryHandler):
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
         (addr, netmask) = entry.get("name").split("/")
-        return (addr, netmask, entry.get("proto"), "",
+        return (addr, netmask, entry.get("proto"), entry.get("mlsrange", ""),
                 entry.get("selinuxtype"))
 
 
@@ -612,7 +613,8 @@ class SELinuxSeloginHandler(SELinuxEntryHandler):
 
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
-        return (entry.get("name"), entry.get("selinuxuser"), "")
+        return (entry.get("name"), entry.get("selinuxuser"),
+                entry.get("mlsrange", ""))
 
 
 class SELinuxSeuserHandler(SELinuxEntryHandler):
@@ -652,15 +654,16 @@ class SELinuxSeuserHandler(SELinuxEntryHandler):
         # prefix.  see the comment in Install() above for more
         # details.
         rv = [entry.get("name"),
-              entry.get("roles", "").replace(" ", ",").split(",")]
+              entry.get("roles", "").replace(" ", ",").split(","),
+              '', entry.get("mlsrange", "")]
         if self.needs_prefix:
-            rv.extend(['', '', entry.get("prefix")])
+            rv.append(entry.get("prefix"))
         else:
             key = self._key(entry)
             if key in self.all_records:
                 attrs = self._key2attrs(key)
                 if attrs['prefix'] != entry.get("prefix"):
-                    rv.extend(['', '', entry.get("prefix")])
+                    rv.append(entry.get("prefix"))
         return tuple(rv)
 
 
@@ -672,7 +675,8 @@ class SELinuxSeinterfaceHandler(SELinuxEntryHandler):
 
     def _defaultargs(self, entry):
         """ argument list for adding, modifying, and deleting entries """
-        return (entry.get("name"), '', entry.get("selinuxtype"))
+        return (entry.get("name"), entry.get("mlsrange", ""),
+                entry.get("selinuxtype"))
 
 
 class SELinuxSepermissiveHandler(SELinuxEntryHandler):
diff --git a/src/lib/Bcfg2/Client/Tools/Systemd.py b/src/lib/Bcfg2/Client/Tools/Systemd.py
index 027d91c71..20a172d3d 100644
--- a/src/lib/Bcfg2/Client/Tools/Systemd.py
+++ b/src/lib/Bcfg2/Client/Tools/Systemd.py
@@ -13,6 +13,8 @@ class Systemd(Bcfg2.Client.Tools.SvcTool):
     __handles__ = [('Service', 'systemd')]
     __req__ = {'Service': ['name', 'status']}
 
+    conflicts = ['Chkconfig']
+
     def get_svc_command(self, service, action):
         return "/bin/systemctl %s %s.service" % (action, service.get('name'))
 
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py
index e40ef750b..3bc261f2f 100644
--- a/src/lib/Bcfg2/Client/__init__.py
+++ b/src/lib/Bcfg2/Client/__init__.py
@@ -19,7 +19,7 @@ def prompt(msg):
     while len(select.select([sys.stdin.fileno()], [], [], 0.0)[0]) > 0:
         os.read(sys.stdin.fileno(), 4096)
     try:
-        ans = input(msg.encode(sys.stdout.encoding, 'replace'))
+        ans = input(msg)
         return ans in ['y', 'Y']
     except EOFError:
         # python 2.4.3 on CentOS doesn't like ^C for some reason