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

[Seth Vidal]

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

Modified Files:
	yumRepo.py 
Log Message:

- fix up a couple of places where the new routines were not used


Index: yumRepo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- yumRepo.py	24 May 2006 23:24:37 -0000	1.6
+++ yumRepo.py	25 May 2006 14:33:34 -0000	1.7
@@ -93,7 +93,8 @@
 
             if item == 'metadata':
                 xml = repo.getPrimaryXML()
-                (ctype, csum) = repo.repoXML.primaryChecksum()
+                xmldata = repo.repoXML.getData('primary')
+                (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getPrimary(xml, csum)
                 if not pickleonly:
                     self.addDict(repo.id, item, dobj, callback)
@@ -101,7 +102,8 @@
 
             elif item == 'filelists':
                 xml = repo.getFileListsXML()
-                (ctype, csum) = repo.repoXML.filelistsChecksum()
+                xmldata = repo.repoXML.getData('filelists')
+                (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getFilelists(xml, csum)
                 if not pickleonly:
                     self.addDict(repo.id, item, dobj, callback)
@@ -110,7 +112,8 @@
 
             elif item == 'otherdata':
                 xml = repo.getOtherXML()
-                (ctype, csum) = repo.repoXML.otherChecksum()
+                xmldata = repo.repoXML.getData('other')
+                (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getOtherdata(xml, csum)
                 if not pickleonly:
                     self.addDict(repo.id, item, dobj, callback)
@@ -583,7 +586,7 @@
         
         thisdata = self.repoXML.getData(mdtype)
         
-        (r_ctype, r_csum) = thisdata.checksums[0] # get the remote checksum
+        (r_ctype, r_csum) = thisdata.checksum # get the remote checksum
 
         if type(fn) == types.InstanceType: # this is an urlgrabber check
             file = fn.filename