[yum-cvs] yum/packageSack.py yum/sqlitesack.py

[James Antill]

 yum/packageSack.py |   11 ++---------
 yum/sqlitesack.py  |   11 -----------
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit a1432ddb27da4b587a939a104592336174351c89
Author: James Antill <james at and.org>
Date:   Tue Dec 11 09:32:19 2007 -0500

    Use the inherited simplePkgListk, rm more code

diff --git a/yum/packageSack.py b/yum/packageSack.py
index 408988d..6723d70 100644
--- a/yum/packageSack.py
+++ b/yum/packageSack.py
@@ -750,16 +750,9 @@ class PackageSack(PackageSackBase):
            
     def simplePkgList(self):
         """returns a list of pkg tuples (n, a, e, v, r) optionally from a single repoid"""
-        if hasattr(self, 'pkglist'):
-            if self.pkglist:
-                return self.pkglist
         
-        simplelist = []
-        for pkg in self.returnPackages():
-            simplelist.append(pkg.pkgtup)
-        
-        self.pkglist = simplelist
-        return simplelist
+        # Don't cache due to excludes
+        return [pkg.pkgtup for pkg in self.returnPackages()]
                        
     def printPackages(self):
         for pkg in self.returnPackages():
diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index 30ae764..1e72f92 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -253,8 +253,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
             }
         if hasattr(self, 'pkgobjlist'):
             del self.pkgobjlist
-        if hasattr(self, 'pkglist'):
-            del self.pkglist
 
         yumRepo.YumPackageSack.close(self)
 
@@ -262,8 +260,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         # we just need to nuke the indexes first
         if hasattr(self, 'pkgobjlist'):
             del self.pkgobjlist
-        if hasattr(self, 'pkglist'):
-            del self.pkglist
         self.returnPackages()
 
     def _checkIndexes(self, failure='error'):
@@ -276,7 +272,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         if not self.excludes.has_key(obj.repo):
             self.excludes[obj.repo] = {}
         self.excludes[obj.repo][obj.pkgId] = 1
-        self.pkglist = None
         
 
     def _excluded(self, repo, pkgId):
@@ -679,12 +674,6 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
         return y
 
     @catchSqliteException
-    def simplePkgList(self):
-        """returns a list of pkg tuples (n, a, e, v, r) from the sack"""
-
-        return [pkg.pkgtup for pkg in self.returnPackages()]
-
-    @catchSqliteException
     def returnNewestByNameArch(self, naTup=None):
 
         # If naTup is set do it from the database otherwise use our parent's