From 7d4325f5e12a40b5b8ae8fc85a4e934b94dd1adf Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 3 Nov 2011 09:15:12 -0400 Subject: added support for default/mandatory/optional package groups --- src/lib/Server/Plugins/Packages/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Plugins/Packages/__init__.py') diff --git a/src/lib/Server/Plugins/Packages/__init__.py b/src/lib/Server/Plugins/Packages/__init__.py index a8cade17d..5b1515920 100644 --- a/src/lib/Server/Plugins/Packages/__init__.py +++ b/src/lib/Server/Plugins/Packages/__init__.py @@ -138,8 +138,14 @@ class Packages(Bcfg2.Server.Plugin.Plugin, initial.add(pkg.get("name")) elif pkg.get("group"): try: - base.update(collection.get_group(pkg.get("group"))) + if pkg.get("type"): + gpkgs = collection.get_group(pkg.get("group"), + ptype=pkg.get("type")) + else: + gpkgs = collection.get_group(pkg.get("group")) + base.update(gpkgs) except TypeError: + raise self.logger.error("Could not resolve group %s" % pkg.get("group")) to_remove.append(pkg) -- cgit v1.2.3-1-g7c22