[yum-cvs] yum/yum __init__.py, 1.226, 1.227 rpmsack.py, 1.8, 1.9 yumRepo.py, 1.16, 1.17

[Seth Vidal]

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

Modified Files:
	__init__.py rpmsack.py yumRepo.py 
Log Message:

fixup a couple of problems


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- __init__.py	19 Aug 2006 19:41:01 -0000	1.226
+++ __init__.py	19 Aug 2006 20:14:32 -0000	1.227
@@ -753,7 +753,7 @@
         else:
             if self.conf.cache:
                 raise Errors.RepoError, \
-                'Header not in local cache and caching-only mode enabled. Cannot download %s' po.hdrpath
+                'Header not in local cache and caching-only mode enabled. Cannot download %s' % po.hdrpath
         
         if self.dsCallback: self.dsCallback.downloadHeader(po.name)
         

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpmsack.py	19 Aug 2006 20:10:43 -0000	1.8
+++ rpmsack.py	19 Aug 2006 20:14:32 -0000	1.9
@@ -48,7 +48,9 @@
                                           rpm.RPMTAG_OBSOLETEVERSION,
                                           rpm.RPMTAG_OBSOLETEFLAGS)
                            }
-
+        if self.ts:
+            self.buildIndexes()
+            
     def buildIndexes(self):
         self.match_on_index = 1
         self.header_indexes = {}
@@ -74,10 +76,14 @@
             self.header_indexes[pkgtuple].append(mi.instance())
         
         self.pkglist = self.header_indexes.keys()
+        
+        del mi
+        
+        
         #FIXME compatibility only - remove once all of rpmUtils/__init__ is no longer used
         self.pkglists = self.pkglist
         
-        del mi
+
 
     def _checkIndexes(self, failure='error'):
         return
@@ -97,6 +103,7 @@
             if not result.has_key(pkg.pkgid):
                 result[pkg.pkgid] = pkg
 
+        del mi
         
         fileresults = self.searchFiles(name)
         for pkg in fileresults:
@@ -115,6 +122,7 @@
             pkg = YumInstalledPackage(hdr)
             if not result.has_key(pkg.pkgid):
                 result[pkg.pkgid] = pkg
+        del mi
         
         return result.values()
         
@@ -138,7 +146,9 @@
                 for pkg in fileresults:
                     if not result.has_key(pkg.pkgid):
                         result[pkg.pkgid] = pkg
-                
+        
+        del mi
+        
         return result.values()
 
     def searchProvides(self, name):
@@ -174,7 +184,9 @@
         for hdr in mi:
             if hdr[rpm.RPMTAG_ARCH] == arch:
                 allpkg.append(self._hdr2pkgTuple(hdr))
-
+        
+        del mi
+        
         if not allpkg:
             # FIXME: raise  ...
             print 'No Package Matching %s' % name

Index: yumRepo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- yumRepo.py	19 Aug 2006 19:59:05 -0000	1.16
+++ yumRepo.py	19 Aug 2006 20:14:32 -0000	1.17
@@ -361,9 +361,7 @@
 
         goodurls = []
         if self.mirrorlist and not self.mirrorlistparsed:
-            try:
-                mirrorurls = getMirrorList(self.mirrorlist, self.proxy_dict)
-            except 
+            mirrorurls = getMirrorList(self.mirrorlist, self.proxy_dict)
             self.mirrorlistparsed = 1
             for url in mirrorurls:
                 url = parser.varReplace(url, self.yumvar)