[yum-cvs] yum/yum groups.py,1.6,1.7

[Menno Smits]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv706

Modified Files:
	groups.py 
Log Message:
Changed Comps exception catching because of change to cElementTree.


Index: groups.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/groups.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- groups.py	21 Dec 2004 07:43:11 -0000	1.6
+++ groups.py	26 Mar 2005 12:20:30 -0000	1.7
@@ -2,7 +2,6 @@
 
 import comps
 import sys
-from libxml2 import parserError
 from Errors import GroupsError
 
 # goals
@@ -65,11 +64,9 @@
         try:
             compsobj = comps.Comps(filename)
         except comps.CompsException, e:
-            raise GroupsError, 'Damaged xml file error:\n %s' % e
-            return
-        except parserError, e:
-            raise GroupsError, 'Damaged or Empty xml file error:\n %s' % e
-            return
+            raise GroupsError, 'Damaged XML file:\n %s' % e
+        except SyntaxError, e:
+            raise GroupsError, 'Damaged or empty XML file:\n %s' % e
 
         self.compscount = self.compscount + 1
         groupsobj = compsobj.groups