[yum-cvs] yum/yum __init__.py,1.260,1.261 config.py,1.106,1.107

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv30305/yum

Modified Files:
	__init__.py config.py 
Log Message:

allow setting the type of packages that will be installed by default on a 
'groupinstall' command.


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- __init__.py	11 Oct 2006 02:32:56 -0000	1.260
+++ __init__.py	17 Nov 2006 07:13:42 -0000	1.261
@@ -1376,7 +1376,14 @@
         
         thisgroup.selected = True
         
-        pkgs = thisgroup.mandatory_packages.keys() + thisgroup.default_packages.keys()
+        pkgs = []
+        if 'mandatory' in self.conf.group_package_types:
+            pkgs.extend(thisgroup.mandatory_packages.keys())
+        if 'default' in self.conf.group_package_types:
+            pkgs.extend(thisgroup.default_packages.keys())
+        if 'optional' in self.conf.group_package_types:
+            pkgs.extend(thisgroup.optional_packages.keys())
+
         for pkg in pkgs:
             self.verbose_logger.log(logginglevels.DEBUG_2,
                 'Adding package %s from group %s', pkg, thisgroup.groupid)

Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- config.py	25 Oct 2006 06:08:31 -0000	1.106
+++ config.py	17 Nov 2006 07:13:42 -0000	1.107
@@ -510,7 +510,8 @@
     enabled = BoolOption(True)
     enablegroups = BoolOption(True)
     enable_group_conditionals = BoolOption(True)
-
+    group_package_types = ListOption(['mandatory', 'default'])
+    
     timeout = FloatOption(30.0)
 
     bandwidth = BytesOption(0)