summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Packages/__init__.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2011-11-03 09:15:12 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2011-11-17 08:13:20 -0500
commit7d4325f5e12a40b5b8ae8fc85a4e934b94dd1adf (patch)
treeb7f0b4beedb1331347ea639b7a70c3c08dd3343e /src/lib/Server/Plugins/Packages/__init__.py
parent2e1e5c6283a16937c02204d4551bd20c29849a11 (diff)
downloadbcfg2-7d4325f5e12a40b5b8ae8fc85a4e934b94dd1adf.tar.gz
bcfg2-7d4325f5e12a40b5b8ae8fc85a4e934b94dd1adf.tar.bz2
bcfg2-7d4325f5e12a40b5b8ae8fc85a4e934b94dd1adf.zip
added support for default/mandatory/optional package groups
Diffstat (limited to 'src/lib/Server/Plugins/Packages/__init__.py')
-rw-r--r--src/lib/Server/Plugins/Packages/__init__.py8
1 files changed, 7 insertions, 1 deletions
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)