[yum-cvs] yum/yum __init__.py, 1.259.2.2, 1.259.2.3 config.py, 1.105.2.1, 1.105.2.2

[Seth Vidal]

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

Modified Files:
      Tag: yum-3_0_X
	__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.259.2.2
retrieving revision 1.259.2.3
diff -u -r1.259.2.2 -r1.259.2.3
--- __init__.py	1 Nov 2006 12:55:23 -0000	1.259.2.2
+++ __init__.py	17 Nov 2006 07:10:36 -0000	1.259.2.3
@@ -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.105.2.1
retrieving revision 1.105.2.2
diff -u -r1.105.2.1 -r1.105.2.2
--- config.py	18 Oct 2006 04:18:03 -0000	1.105.2.1
+++ config.py	17 Nov 2006 07:10:36 -0000	1.105.2.2
@@ -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)