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, 8 insertions, 13 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index 2735e389a..e9744c777 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -4,6 +4,8 @@
 import os
 import sys
 import Bcfg2.Server.Plugin
+from Bcfg2.Options import get_option_parser
+from Bcfg2.Server.Statistics import track_statistics
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError
 
 
@@ -15,9 +17,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
     :class:`Bcfg2.Server.Plugins.Packages.Source.Source` object for
     each ``Source`` tag. """
 
-    __identifier__ = None
-
-    def __init__(self, filename, cachepath, fam, packages, setup):
+    def __init__(self, filename, cachepath, packages):
         """
         :param filename: The full path to ``sources.xml``
         :type filename: string
@@ -25,22 +25,17 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
                           :class:`Bcfg2.Server.Plugins.Packages.Source.Source`
                           data will be cached
         :type cachepath: string
-        :param fam: The file access monitor to use to create watches
-                    on ``sources.xml`` and any XIncluded files.
-        :type fam: Bcfg2.Server.FileMonitor.FileMonitor
         :param packages: The Packages plugin object ``sources.xml`` is
                          being parsed on behalf of (i.e., the calling
                          object)
         :type packages: Bcfg2.Server.Plugins.Packages.Packages
-        :param setup: A Bcfg2 options dict
-        :type setup: dict
 
         :raises: :class:`Bcfg2.Server.Plugin.exceptions.PluginInitError` -
                  If ``sources.xml`` cannot be read
         """
         Bcfg2.Server.Plugin.Debuggable.__init__(self)
         try:
-            Bcfg2.Server.Plugin.StructFile.__init__(self, filename, fam=fam,
+            Bcfg2.Server.Plugin.StructFile.__init__(self, filename,
                                                     should_monitor=True)
         except OSError:
             err = sys.exc_info()[1]
@@ -62,7 +57,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
                 self.logger.error("Could not create Packages cache at %s: %s" %
                                   (self.cachepath, err))
         #: The Bcfg2 options dict
-        self.setup = setup
+        self.setup = get_option_parser()
 
         #: The :class:`Bcfg2.Server.Plugins.Packages.Packages` that
         #: instantiated this ``PackagesSources`` object
@@ -111,7 +106,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
         load its data. """
         return sorted(list(self.parsed)) == sorted(self.extras)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Index(self):
         Bcfg2.Server.Plugin.StructFile.Index(self)
         self.entries = []
@@ -124,7 +119,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
         ``Index`` is responsible for calling :func:`source_from_xml`
         for each ``Source`` tag in each file. """
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def source_from_xml(self, xsource):
         """ Create a
         :class:`Bcfg2.Server.Plugins.Packages.Source.Source` subclass
@@ -157,7 +152,7 @@ class PackagesSources(Bcfg2.Server.Plugin.StructFile,
             return None
 
         try:
-            source = cls(self.cachepath, xsource, self.setup)
+            source = cls(self.cachepath, xsource)
         except SourceInitError:
             err = sys.exc_info()[1]
             self.logger.error("Packages: %s" % err)