[yum-cvs] yum/yum repoMDObject.py,1.1,1.2

Seth Vidal skvidal at linux.duke.edu
Fri Jun 9 21:17:08 UTC 2006


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

Modified Files:
	repoMDObject.py 
Log Message:
apply lewk's patch to fix jeremy's lambda (iiiiiiiiiick)
make corrupt repomd.xml's do the right thing in the new celementree
repomd.xml parser



Index: repoMDObject.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repoMDObject.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- repoMDObject.py	28 May 2006 05:32:49 -0000	1.1
+++ repoMDObject.py	9 Jun 2006 21:17:06 -0000	1.2
@@ -74,13 +74,16 @@
             infile = srcfile
         
         parser = iterparse(infile)
-
-        for event, elem in parser:
-            elem_name = ns_cleanup(elem.tag)
-            
-            if elem_name == "data":
-                thisdata = RepoData(elem=elem)
-                self.repoData[thisdata.type] = thisdata
+        
+        try:
+            for event, elem in parser:
+                elem_name = ns_cleanup(elem.tag)
+                
+                if elem_name == "data":
+                    thisdata = RepoData(elem=elem)
+                    self.repoData[thisdata.type] = thisdata
+        except SyntaxError, e:
+            raise RepoMDError, "Damaged repomd.xml file"
             
     def fileTypes(self):
         """return list of metadata file types available"""




More information about the Yum-cvs-commits mailing list