[yum-git] 3 commits - yum/rpmsack.py

[James Antill]

 yum/rpmsack.py |   29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

New commits:
commit da614bd9be917ce4765839668bb2f3867305a8cc
Author: James Antill <james at and.org>
Date:   Sat Mar 29 00:50:41 2008 -0400

     Remove extra searchFiles ... searchProvides does it already
     Also remove files from _cache, as searchProvides() now does it well enough.

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 669a564..c6bcbc0 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -97,7 +97,6 @@ class RPMDBPackageSack(PackageSackBase):
         self.ts = None
 
         self._cache = {
-            'files' : { },
             'provides' : { },
             'requires' : { },
             'conflicts' : { },
@@ -126,7 +125,6 @@ class RPMDBPackageSack(PackageSackBase):
         self._get_req_cache = {}
         misc._share_data_store = {}
         self._cache = {
-            'files' : { },
             'provides' : { },
             'requires' : { },
             'conflicts' : { },
@@ -174,10 +172,6 @@ class RPMDBPackageSack(PackageSackBase):
     def searchFiles(self, name):
         """search the filelists in the rpms for anything matching name"""
 
-        result = self._cache['files'].get(name)
-        if result is not None:
-            return result
-
         ts = self.readOnlyTS()
         result = {}
         
@@ -189,7 +183,6 @@ class RPMDBPackageSack(PackageSackBase):
         del mi
 
         result = result.values()
-        self._cache['files'][name] = result
         return result
         
     def searchPrco(self, name, prcotype):
@@ -541,10 +534,6 @@ class RPMDBPackageSack(PackageSackBase):
         
         pkgs = self.searchProvides(name)
         
-        if name[0] =='/':
-            morepkgs = self.searchFiles(name)
-            pkgs.extend(morepkgs)
-        
         result = { }
         
         for po in pkgs:
commit d7c2294c7f1a596106e6a3153dd98154415eed89
Author: James Antill <james at and.org>
Date:   Sat Mar 29 00:45:53 2008 -0400

    Drop _cache data in dropCachedData

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index bd02ec4..669a564 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -125,6 +125,13 @@ class RPMDBPackageSack(PackageSackBase):
         self._get_pro_cache = {}
         self._get_req_cache = {}
         misc._share_data_store = {}
+        self._cache = {
+            'files' : { },
+            'provides' : { },
+            'requires' : { },
+            'conflicts' : { },
+            'obsoletes' : { },
+            }
 
     def readOnlyTS(self):
         if not self.ts:
commit 4039875a6d5f92822d1badf52558fde3ba66aa5b
Author: James Antill <james at and.org>
Date:   Sat Mar 29 00:43:26 2008 -0400

    Share data from the pkglist thing, save about 0.5MB -- 0.25% ish :O

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 58cc53d..bd02ec4 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -419,17 +419,18 @@ class RPMDBPackageSack(PackageSackBase):
         return po
         
     def _hdr2pkgTuple(self, hdr):
-        name = hdr['name']
-        arch = hdr['arch']
-        ver = str(hdr['version']) # convert these to strings to be sure
-        rel = str(hdr['release'])
+        name = misc.share_data(hdr['name'])
+        arch = misc.share_data(hdr['arch'])
+         # convert these to strings to be sure
+        ver = misc.share_data(str(hdr['version']))
+        rel = misc.share_data(str(hdr['release']))
         epoch = hdr['epoch']
         if epoch is None:
             epoch = '0'
         else:
             epoch = str(epoch)
-    
-        return (name, arch, epoch, ver, rel)
+        epoch = misc.share_data(epoch)
+        return misc.share_data((name, arch, epoch, ver, rel))
 
     # deprecated options for compat only - remove once rpmdb is converted:
     def getPkgList(self):