[yum-cvs] yum/yum rpmsack.py,1.34,1.35

[Seth Vidal]

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

Modified Files:
	rpmsack.py 
Log Message:

merge forward the remove-rpmdb-close patch


Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- rpmsack.py	23 Nov 2006 02:24:50 -0000	1.34
+++ rpmsack.py	21 Jan 2007 20:08:01 -0000	1.35
@@ -46,7 +46,8 @@
     def __init__(self, root='/'):
         self.root = root
         self._header_dict = {}
-
+        self.ts = None
+        
     def _get_pkglist(self):
         '''Getter for the pkglist property. 
         Returns a list of package tuples.
@@ -57,7 +58,9 @@
     pkglist = property(_get_pkglist, None)
 
     def readOnlyTS(self):
-        return initReadOnlyTransaction(root=self.root)
+        if not self.ts:
+            self.ts =  initReadOnlyTransaction(root=self.root)
+        return self.ts
 
     def buildIndexes(self):
         # Not used here
@@ -84,7 +87,6 @@
             if not result.has_key(pkg.pkgid):
                 result[pkg.pkgid] = pkg
         del mi
-        ts.close()
         
         fileresults = self.searchFiles(name)
         for pkg in fileresults:
@@ -104,7 +106,7 @@
             if not result.has_key(pkg.pkgid):
                 result[pkg.pkgid] = pkg
         del mi
-        ts.close()
+
         
         return result.values()
         
@@ -132,7 +134,6 @@
                         result[pkg.pkgid] = pkg
         
         del mi
-        ts.close()
         
         return result.values()
 
@@ -213,8 +214,6 @@
             if hdr['name'] != 'gpg-pubkey':
                 yield (hdr, mi.instance())
         del mi
-        ts.close()
-        del ts
 
     def _header_from_index(self, idx):
         """returns a package header having been given an index"""
@@ -232,8 +231,6 @@
             del hdr
 
         del mi
-        ts.close()
-        del ts
 
     def _make_header_dict(self):
         """generate a header indexes dict that is pkgtup = index number"""
@@ -290,7 +287,6 @@
             if hdr['name'] != 'gpg-pubkey':
                 yield (hdr, mi.instance())
 
-        ts.close()
 
     def _makePackageObject(self, hdr, index):
         po = YumInstalledPackage(hdr)