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, 14 insertions, 38 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 985405e65..5cf90e188 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -27,7 +27,6 @@ in your ``Source`` subclass:
 
 * :func:`Source.urls`
 * :func:`Source.read_files`
-* :attr:`Source.basegroups`
 
 Additionally, you may want to consider overriding the following
 methods and attributes:
@@ -51,9 +50,11 @@ import os
 import re
 import sys
 import Bcfg2.Server.Plugin
+from Bcfg2.Options import get_option_parser
 from Bcfg2.Compat import HTTPError, HTTPBasicAuthHandler, \
      HTTPPasswordMgrWithDefaultRealm, install_opener, build_opener, \
      urlopen, cPickle, md5
+from Bcfg2.Server.Statistics import track_statistics
 
 
 def fetch_url(url):
@@ -106,25 +107,18 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
     those features.
     """
 
-    #: The list of
-    #: :ref:`server-plugins-generators-packages-magic-groups` that
-    #: make sources of this type available to clients.
-    basegroups = []
-
     #: The Package type handled by this Source class.  The ``type``
     #: attribute of Package entries will be set to the value ``ptype``
     #: when they are handled by :mod:`Bcfg2.Server.Plugins.Packages`.
     ptype = None
 
-    def __init__(self, basepath, xsource, setup):  # pylint: disable=R0912
+    def __init__(self, basepath, xsource):  # pylint: disable=R0912
         """
         :param basepath: The base filesystem path under which cache
                          data for this source should be stored
         :type basepath: string
         :param xsource: The XML tag that describes this source
         :type source: lxml.etree._Element
-        :param setup: A Bcfg2 options dict
-        :type setup: dict
         :raises: :class:`Bcfg2.Server.Plugins.Packages.Source.SourceInitError`
         """
         Bcfg2.Server.Plugin.Debuggable.__init__(self)
@@ -137,7 +131,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
         self.xsource = xsource
 
         #: A Bcfg2 options dict
-        self.setup = setup
+        self.setup = get_option_parser()
 
         #: A set of package names that are deemed "essential" by this
         #: source
@@ -304,8 +298,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
         :return: list of strings - group names
         """
         return sorted(list(set([g for g in metadata.groups
-                                if (g in self.basegroups or
-                                    g in self.groups or
+                                if (g in self.groups or
                                     g in self.arches)])))
 
     def load_state(self):
@@ -328,7 +321,7 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
                       self.essentialpkgs), cache, 2)
         cache.close()
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def setup_data(self, force_update=False):
         """ Perform all data fetching and setup tasks.  For most
         backends, this involves downloading all metadata from the
@@ -632,16 +625,15 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
 
     def applies(self, metadata):
         """ Return true if this source applies to the given client,
-        i.e., the client is in all necessary groups and
-        :ref:`server-plugins-generators-packages-magic-groups`.
+        i.e., the client is in all necessary groups.
 
         :param metadata: The client metadata to check to see if this
                          source applies
         :type metadata: Bcfg2.Server.Plugins.Metadata.ClientMetadata
         :returns: bool
         """
-        # check base groups
-        if not self.magic_groups_match(metadata):
+        # check arch groups
+        if not self.arch_groups_match(metadata):
             return False
 
         # check Group/Client tags from sources.xml
@@ -712,29 +704,13 @@ class Source(Bcfg2.Server.Plugin.Debuggable):  # pylint: disable=R0902
         """
         return []
 
-    def magic_groups_match(self, metadata):
-        """ Returns True if the client's
-        :ref:`server-plugins-generators-packages-magic-groups` match
-        the magic groups this source.  Also returns True if magic
-        groups are off in the configuration and the client's
-        architecture matches (i.e., architecture groups are *always*
-        checked).
+    def arch_groups_match(self, metadata):
+        """ Returns True if the client is in an arch group that
+        matches the arch of this source.
 
         :returns: bool
         """
-        found_arch = False
         for arch in self.arches:
             if arch in metadata.groups:
-                found_arch = True
-                break
-        if not found_arch:
-            return False
-
-        if not self.setup.cfp.getboolean("packages", "magic_groups",
-                                         default=False):
-            return True
-        else:
-            for group in self.basegroups:
-                if group in metadata.groups:
-                    return True
-            return False
+                return True
+        return False