Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Admin/Viz.py
	src/lib/Bcfg2/Server/Plugins/Packages/__init__.py

1 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/Bcfg2/Server/MultiprocessingCore.py b/src/lib/Bcfg2/Server/MultiprocessingCore.py
index cce6bc0c3..517140178 100644
--- a/src/lib/Bcfg2/Server/MultiprocessingCore.py
+++ b/src/lib/Bcfg2/Server/MultiprocessingCore.py
@@ -294,8 +294,7 @@ class ChildCore(Core):
 
     def _get_rmi(self):
         rmi = dict()
-        for pname, pinst in self.plugins.items() + \
-                [(self.fam.__class__.__name__, self.fam)]:
+        for pname, pinst in self._get_rmi_objects().items():
             for crmi in pinst.__child_rmi__:
                 if isinstance(crmi, tuple):
                     mname = crmi[1]
@@ -429,8 +428,7 @@ class MultiprocessingCore(BuiltinCore):
 
     def _get_rmi(self):
         child_rmi = dict()
-        for pname, pinst in self.plugins.items() + \
-                [(self.fam.__class__.__name__, self.fam)]:
+        for pname, pinst in self._get_rmi_objects().items():
             for crmi in pinst.__child_rmi__:
                 if isinstance(crmi, tuple):
                     parentname, childname = crmi
@@ -453,6 +451,8 @@ class MultiprocessingCore(BuiltinCore):
         (i.e., in the parent process). """
         @wraps(parent_rmi)
         def inner(*args, **kwargs):
+            """ Function that dispatches an RMI call to child
+            processes and to the (original) parent function. """
             self.logger.debug("Dispatching RMI call to %s to children: %s" %
                               (method, child_rmi))
             self.rpc_q.publish(child_rmi, args=args, kwargs=kwargs)