diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-31 12:58:35 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 10:45:07 -0500 |
| commit | f522a29f8aebc26e4dedb7c6485951cfe0663ea2 (patch) | |
| tree | 2dafcf000b8bc3b25782982e5ad6fa38b14f4e3f /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | c0b2afa6e86557d5d206a64bd886034f432eee8d (diff) | |
| download | bcfg2-f522a29f8aebc26e4dedb7c6485951cfe0663ea2.tar.gz bcfg2-f522a29f8aebc26e4dedb7c6485951cfe0663ea2.tar.bz2 bcfg2-f522a29f8aebc26e4dedb7c6485951cfe0663ea2.zip | |
removed magic groups
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index c1915eeb4..666ea995c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -64,14 +64,6 @@ class Packages(Bcfg2.Server.Plugin.Plugin, # create key directory if needed os.makedirs(self.keypath) - # warn about deprecated magic groups - if self.core.setup.cfp.getboolean("packages", "magic_groups", - default=False): - self.logger.warning("Packages: Magic groups are deprecated and " - "will be removed in a future release") - self.logger.warning("You can disable magic groups by setting " - "magic_groups=0 in [packages] in bcfg2.conf") - # pylint: disable=C0301 #: The #: :class:`Bcfg2.Server.Plugins.Packages.PackagesSources.PackagesSources` @@ -230,13 +222,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, :raises: :class:`Bcfg2.Server.Plugin.exceptions.PluginExecutionError` """ if entry.tag == 'Package': - if self.core.setup.cfp.getboolean("packages", "magic_groups", - default=False): - collection = self.get_collection(metadata) - if collection.magic_groups_match(): - return True - else: - return True + return True elif entry.tag == 'Path': # managed entries for yum/apt configs if (entry.get("name") == \ |