[yum-cvs] yum/yum __init__.py,1.196,1.196.2.1

[Jeremy Katz]

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

Modified Files:
      Tag: yum-2_6_X
	__init__.py 
Log Message:
don't traceback if conditionals have non-existent packages (rh#185946)


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.196
retrieving revision 1.196.2.1
diff -u -r1.196 -r1.196.2.1
--- __init__.py	7 Mar 2006 04:38:06 -0000	1.196
+++ __init__.py	22 Mar 2006 19:39:06 -0000	1.196.2.1
@@ -1385,7 +1385,11 @@
         if self.conf.enable_group_conditionals:
             for condreq, cond in thisgroup.conditional_packages.iteritems():
                 if self._isPackageInstalled(cond):
-                    txmbrs = self.install(name = condreq)
+                    try:
+                        txmbrs = self.install(name = condreq)
+                    except Errors.InstallError:
+                        # we don't care if the package doesn't exist
+                        continue
                     txmbrs_used.extend(txmbrs)
                     for txmbr in txmbrs:
                         txmbr.groups.append(thisgroup.groupid)