Merge branch '1.3.2' into maint

Conflicts:
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
	testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py
	testsuite/Testsrc/test_code_checks.py

3 files changed, 25 insertions, 25 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/base.py b/src/lib/Bcfg2/Server/Plugin/base.py
index e74909ee9..f7bc08717 100644
--- a/src/lib/Bcfg2/Server/Plugin/base.py
+++ b/src/lib/Bcfg2/Server/Plugin/base.py
@@ -2,6 +2,7 @@
 
 import os
 import logging
+from Bcfg2.Utils import ClassName
 
 
 class Debuggable(object):
@@ -33,8 +34,8 @@ class Debuggable(object):
         :returns: bool - The new value of the debug flag
         """
         self.debug_flag = debug
-        self.debug_log("%s: debug_flag = %s" % (self.__class__.__name__,
-                                                self.debug_flag),
+        self.debug_log("%s: debug = %s" % (self.__class__.__name__,
+                                           self.debug_flag),
                        flag=True)
         return debug
 
@@ -59,18 +60,6 @@ class Debuggable(object):
             self.logger.error(message)
 
 
-class ClassName(object):
-    """ This very simple descriptor class exists only to get the name
-    of the owner class.  This is used because, for historical reasons,
-    we expect every plugin to have a ``name`` attribute that is in
-    almost all cases the same as the ``__class__.__name__`` attribute
-    of the plugin object.  This makes that more dynamic so that each
-    plugin isn't repeating its own name. """
-
-    def __get__(self, inst, owner):
-        return owner.__name__
-
-
 class Plugin(Debuggable):
     """ The base class for all Bcfg2 Server plugins. """
 
@@ -133,6 +122,7 @@ class Plugin(Debuggable):
         """ Perform shutdown tasks for the plugin
 
         :returns: None """
+        self.debug_log("Shutting down %s plugin" % self.name)
         self.running = False
 
     def __str__(self):
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 41c450b4e..c2252f956 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -5,6 +5,7 @@ import re
 import sys
 import copy
 import time
+import glob
 import logging
 import operator
 import lxml.etree
@@ -503,13 +504,14 @@ class XMLFileBacked(FileBacked):
 
     def _follow_xincludes(self, fname=None, xdata=None):
         """ follow xincludes, adding included files to self.extras """
+        xinclude = '%sinclude' % Bcfg2.Server.XI_NAMESPACE
+
         if xdata is None:
             if fname is None:
                 xdata = self.xdata.getroottree()
             else:
                 xdata = lxml.etree.parse(fname)
-        included = [el for el in xdata.findall('//%sinclude' %
-                                               Bcfg2.Server.XI_NAMESPACE)]
+        included = [el for el in xdata.findall('//' + xinclude)]
         for el in included:
             name = el.get("href")
             if name.startswith("/"):
@@ -520,16 +522,23 @@ class XMLFileBacked(FileBacked):
                 else:
                     rel = self.name
                 fpath = os.path.join(os.path.dirname(rel), name)
-            if fpath not in self.extras:
-                if os.path.exists(fpath):
-                    self._follow_xincludes(fname=fpath)
-                    self.add_monitor(fpath)
+
+            # expand globs in xinclude, a bcfg2-specific extension
+            extras = glob.glob(fpath)
+            if not extras:
+                msg = "%s: %s does not exist, skipping" % (self.name, name)
+                if el.findall('./%sfallback' % Bcfg2.Server.XI_NAMESPACE):
+                    LOGGER.debug(msg)
                 else:
-                    msg = "%s: %s does not exist, skipping" % (self.name, name)
-                    if el.findall('./%sfallback' % Bcfg2.Server.XI_NAMESPACE):
-                        LOGGER.debug(msg)
-                    else:
-                        LOGGER.warning(msg)
+                    LOGGER.warning(msg)
+
+            parent = el.getparent()
+            parent.remove(el)
+            for extra in extras:
+                if extra != self.name and extra not in self.extras:
+                    self.add_monitor(extra)
+                    lxml.etree.SubElement(parent, xinclude, href=extra)
+                    self._follow_xincludes(fname=extra)
 
     def Index(self):
         self.xdata = lxml.etree.XML(self.data, base_url=self.name,
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py
index f42ada773..cb996b1ca 100644
--- a/src/lib/Bcfg2/Server/Plugin/interfaces.py
+++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py
@@ -313,6 +313,7 @@ class Threaded(object):
         """
         raise NotImplementedError
 
+
 class ThreadedStatistics(Statistics, Threaded, threading.Thread):
     """ ThreadedStatistics plugins process client statistics in a
     separate thread. """