[yum-cvs] yum/yum __init__.py, 1.211, 1.212 repos.py, 1.94, 1.95 storagefactory.py, 1.2, 1.3 yumRepo.py, 1.11, 1.12

[Seth Vidal]

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

Modified Files:
	__init__.py repos.py storagefactory.py yumRepo.py 
Log Message:

all pickle references and mdcache references removed, I think. :)


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- __init__.py	19 Jun 2006 03:14:41 -0000	1.211
+++ __init__.py	21 Jun 2006 17:07:44 -0000	1.212
@@ -868,27 +868,6 @@
         msg = '%d packages removed' % removed
         return 0, [msg]
 
-    def cleanPickles(self):
-        filelist = []
-        ext = 'pickle'
-        removed = 0
-        for repo in self.repos.listEnabled():
-            repo.dirSetup()
-            path = repo.cachedir
-            filelist = misc.getFileList(path, ext, filelist)
-            
-        for item in filelist:
-            try:
-                os.unlink(item)
-            except OSError, e:
-                self.errorlog(0, 'Cannot remove cache file %s' % item)
-                continue
-            else:
-                self.log(7, 'Cache file %s removed' % item)
-                removed+=1
-        msg = '%d cache files removed' % removed
-        return 0, [msg]
-    
     def cleanSqlite(self):
         filelist = []
         ext = 'sqlite'

Index: repos.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repos.py,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- repos.py	28 May 2006 05:32:49 -0000	1.94
+++ repos.py	21 Jun 2006 17:07:44 -0000	1.95
@@ -170,7 +170,7 @@
         return self.pkgSack
 
 
-    def populateSack(self, which='enabled', with='metadata', callback=None, pickleonly=0):
+    def populateSack(self, which='enabled', with='metadata', callback=None, cacheonly=0):
         """This populates the package sack from the repositories, two optional 
            arguments: which='repoid, enabled, all'
                       with='metadata, filelists, otherdata, all'"""
@@ -201,7 +201,7 @@
          
         for repo in myrepos:
             sack = repo.getPackageSack()
-            sack.populate(repo, with, callback, pickleonly)
+            sack.populate(repo, with, callback, cacheonly)
             self.pkgSack.addSack(repo.id, sack)
 
 

Index: storagefactory.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/storagefactory.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- storagefactory.py	30 May 2006 10:15:41 -0000	1.2
+++ storagefactory.py	21 Jun 2006 17:07:44 -0000	1.3
@@ -31,24 +31,6 @@
     def GetPackageSack(self):
         pass
 
-class StoragePickle(Storage):
-
-    def __init__(self):
-        import packages
-        import mdcache
-
-        self.packages = packages
-        self.mdcache = mdcache
-
-    def Name(self):
-        return "pickle"
-
-    def GetCacheHandler(self, storedir, repoid, callback):
-        return self.mdcache.RepodataParser(storedir, callback)
-
-    def GetPackageSack(self):
-        return repos.YumPackageSack(self.packages.YumAvailablePackage)
-
 class StorageSqlite(Storage):
 
     def __init__(self):
@@ -103,11 +85,5 @@
     except:
         pass
 
-    try:
-        storage = StoragePickle()
-        return storage
-    except:
-        pass
-
     raise Errors.YumBaseError, 'Could not find any working storages.'
 

Index: yumRepo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- yumRepo.py	13 Jun 2006 01:26:12 -0000	1.11
+++ yumRepo.py	21 Jun 2006 17:07:44 -0000	1.12
@@ -13,7 +13,6 @@
 from repos import Repository
 from packages import YumAvailablePackage
 import parser
-import mdcache
 import storagefactory
 
 
@@ -68,7 +67,7 @@
             # umm, wtf?
             pass
 
-    def populate(self, repo, with='metadata', callback=None, pickleonly=0):
+    def populate(self, repo, with='metadata', callback=None, cacheonly=0):
         if with == 'all':
             data = ['metadata', 'filelists', 'otherdata']
         else:
@@ -90,7 +89,7 @@
                 xmldata = repo.repoXML.getData('primary')
                 (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getPrimary(xml, csum)
-                if not pickleonly:
+                if not cacheonly:
                     self.addDict(repo.id, item, dobj, callback)
                 del dobj
 
@@ -99,7 +98,7 @@
                 xmldata = repo.repoXML.getData('filelists')
                 (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getFilelists(xml, csum)
-                if not pickleonly:
+                if not cacheonly:
                     self.addDict(repo.id, item, dobj, callback)
                 del dobj
 
@@ -109,7 +108,7 @@
                 xmldata = repo.repoXML.getData('other')
                 (ctype, csum) = xmldata.checksum
                 dobj = repo.cacheHandler.getOtherdata(xml, csum)
-                if not pickleonly:
+                if not cacheonly:
                     self.addDict(repo.id, item, dobj, callback)
                 del dobj