Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 15 insertions, 23 deletions

diff --git a/src/lib/Bcfg2/Client/Tools/SELinux.py b/src/lib/Bcfg2/Client/Tools/SELinux.py
index 451495be2..baf930610 100644
--- a/src/lib/Bcfg2/Client/Tools/SELinux.py
+++ b/src/lib/Bcfg2/Client/Tools/SELinux.py
@@ -7,6 +7,7 @@ import copy
 import glob
 import struct
 import socket
+import logging
 import selinux
 import seobject
 import Bcfg2.Client.XML
@@ -76,14 +77,13 @@ class SELinux(Bcfg2.Client.Tools.Tool):
                    SEPort=['name', 'selinuxtype'],
                    SEUser=['name', 'roles', 'prefix'])
 
-    def __init__(self, logger, setup, config):
-        Bcfg2.Client.Tools.Tool.__init__(self, logger, setup, config)
+    def __init__(self, config):
+        Bcfg2.Client.Tools.Tool.__init__(self, config)
         self.handlers = {}
         for handler in self.__handles__:
             etype = handler[0]
             self.handlers[etype] = \
-                globals()["SELinux%sHandler" % etype.title()](self, logger,
-                                                              setup, config)
+                globals()["SELinux%sHandler" % etype.title()](self, config)
         self.txn = False
         self.post_txn_queue = []
 
@@ -99,10 +99,6 @@ class SELinux(Bcfg2.Client.Tools.Tool):
         # http://docs.python.org/2/reference/datamodel.html#object.__getattr__
         # for details
 
-    def BundleUpdated(self, _, states):
-        for handler in self.handlers.values():
-            handler.BundleUpdated(states)
-
     def FindExtra(self):
         extra = []
         for handler in self.handlers.values():
@@ -118,7 +114,7 @@ class SELinux(Bcfg2.Client.Tools.Tool):
         in the specification """
         return self.handlers[entry.tag].primarykey(entry)
 
-    def Install(self, entries, states):
+    def Install(self, entries):
         # start a transaction
         semanage = seobject.semanageRecords("")
         if hasattr(semanage, "start"):
@@ -128,13 +124,14 @@ class SELinux(Bcfg2.Client.Tools.Tool):
         else:
             self.logger.debug("SELinux transactions not supported; this may "
                               "slow things down considerably")
-        Bcfg2.Client.Tools.Tool.Install(self, entries, states)
+        states = Bcfg2.Client.Tools.Tool.Install(self, entries)
         if hasattr(semanage, "finish"):
             self.logger.debug("Committing SELinux transaction")
             semanage.finish()
             self.txn = False
             for func, arg, kwargs in self.post_txn_queue:
                 states[arg] = func(*arg, **kwargs)
+        return states
 
     def GenericSEInstall(self, entry):
         """Dispatch install to the proper method according to entry tag"""
@@ -173,10 +170,10 @@ class SELinuxEntryHandler(object):
     custom_re = re.compile(' (?P<name>\S+)$')
     custom_format = None
 
-    def __init__(self, tool, logger, setup, config):
+    def __init__(self, tool, config):
         self.tool = tool
-        self.logger = logger
-        self.setup = setup
+        self.logger = logging.getLogger(self.__class__.__name__)
+        self.setup = tool.setup
         self.config = config
         self._records = None
         self._all = None
@@ -369,11 +366,6 @@ class SELinuxEntryHandler(object):
                 for key in records.keys()
                 if key not in specified]
 
-    def BundleUpdated(self, states):
-        """ perform any additional magic tasks that need to be run
-        when a bundle is updated """
-        pass
-
 
 class SELinuxSebooleanHandler(SELinuxEntryHandler):
     """ handle SELinux boolean entries """
@@ -619,8 +611,8 @@ class SELinuxSeuserHandler(SELinuxEntryHandler):
     etype = "user"
     value_format = ("prefix", None, None, "roles")
 
-    def __init__(self, tool, logger, setup, config):
-        SELinuxEntryHandler.__init__(self, tool, logger, setup, config)
+    def __init__(self, tool, config):
+        SELinuxEntryHandler.__init__(self, tool, config)
         self.needs_prefix = False
 
     @property
@@ -711,9 +703,9 @@ class SELinuxSemoduleHandler(SELinuxEntryHandler):
     etype = "module"
     value_format = (None, "disabled")
 
-    def __init__(self, tool, logger, setup, config):
-        SELinuxEntryHandler.__init__(self, tool, logger, setup, config)
-        self.filetool = POSIXFile(logger, setup, config)
+    def __init__(self, tool, config):
+        SELinuxEntryHandler.__init__(self, tool, config)
+        self.filetool = POSIXFile(config)
         try:
             self.setype = selinux.selinux_getpolicytype()[1]
         except IndexError: