[yum-cvs] yum/yum comps.py,1.10.4.4,1.10.4.5

Jeremy Katz katzj at linux.duke.edu
Thu Jan 25 18:50:05 UTC 2007


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

Modified Files:
      Tag: yum-3_0_X
	comps.py 
Log Message:
ignore bogus lines to avoid things like #224292

Index: comps.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/comps.py,v
retrieving revision 1.10.4.4
retrieving revision 1.10.4.5
diff -u -r1.10.4.4 -r1.10.4.5
--- comps.py	5 Dec 2006 14:39:34 -0000	1.10.4.4
+++ comps.py	25 Jan 2007 18:50:03 -0000	1.10.4.5
@@ -140,7 +140,8 @@
                     genre = u'mandatory'
 
                 if genre not in ('mandatory', 'default', 'optional', 'conditional'):
-                    raise CompsException
+                    # ignore bogus lines
+                    continue
 
                 package = child.text
                 if genre == 'mandatory':




More information about the Yum-cvs-commits mailing list