[yum-cvs] yum cli.py,1.216,1.217 output.py,1.66,1.67

[Seth Vidal]

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

Modified Files:
	cli.py output.py 
Log Message:

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


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- cli.py	15 Jun 2006 09:59:14 -0000	1.216
+++ cli.py	21 Jun 2006 17:07:44 -0000	1.217
@@ -391,9 +391,9 @@
         elif self.basecmd == 'clean':
             if len(self.extcmds) == 0:
                 self.errorlog(0,
-                    _('Error: clean requires an option: headers, packages, cache, metadata, plugins, all'))
+                    _('Error: clean requires an option: headers, packages, dbcache, metadata, plugins, all'))
             for cmd in self.extcmds:
-                if cmd not in ['headers', 'packages', 'metadata', 'cache', 'dbcache', 'plugins', 'all']:
+                if cmd not in ['headers', 'packages', 'metadata', 'dbcache', 'plugins', 'all']:
                     self.usage()
                     raise CliError
                     
@@ -599,14 +599,13 @@
         elif self.basecmd in ['makecache']:
             self.log(2, "Making cache files for all metadata files.")
             self.log(2, "This may take a while depending on the speed of this computer")
-            self.log(3, '%s' % self.pickleRecipe())
             try:
                 for repo in self.repos.findRepos('*'):
                     repo.metadata_expire = 0
                 self.doRepoSetup(dosack=0)
-                self.repos.populateSack(with='metadata', pickleonly=1)
-                self.repos.populateSack(with='filelists', pickleonly=1)
-                self.repos.populateSack(with='otherdata', pickleonly=1)
+                self.repos.populateSack(with='metadata', cacheonly=1)
+                self.repos.populateSack(with='filelists', cacheonly=1)
+                self.repos.populateSack(with='otherdata', cacheonly=1)
                 
             except yum.Errors.YumBaseError, e:
                 return 1, [str(e)]
@@ -1209,8 +1208,8 @@
     def cleanCli(self, userlist=None):
         if userlist is None:
             userlist = self.extcmds
-        hdrcode = pkgcode = xmlcode = piklcode = dbcode = 0
-        pkgresults = hdrresults = xmlresults = piklresults = dbresults = []
+        hdrcode = pkgcode = xmlcode = dbcode = 0
+        pkgresults = hdrresults = xmlresults = dbresults = []
 
         if 'all' in self.extcmds:
             self.log(2, 'Cleaning up Everything')
@@ -1218,11 +1217,10 @@
             hdrcode, hdrresults = self.cleanHeaders()
             xmlcode, xmlresults = self.cleanMetadata()
             dbcode, dbresults = self.cleanSqlite()
-            piklcode, piklresults = self.cleanPickles()
             self.plugins.run('clean')
             
-            code = hdrcode + pkgcode + xmlcode + piklcode + dbcode
-            results = hdrresults + pkgresults + xmlresults + piklresults + dbresults
+            code = hdrcode + pkgcode + xmlcode + dbcode
+            results = hdrresults + pkgresults + xmlresults + dbresults
             for msg in results:
                 self.log(2, msg)
             return code, []
@@ -1236,9 +1234,6 @@
         if 'metadata' in self.extcmds:
             self.log(2, 'Cleaning up xml metadata')
             xmlcode, xmlresults = self.cleanMetadata()
-        if 'cache' in self.extcmds:
-            self.log(2, 'Cleaning up pickled cache')
-            piklcode, piklresults =  self.cleanPickles()
         if 'dbcache' in self.extcmds:
             self.log(2, 'Cleaning up database cache')
             dbcode, dbresults =  self.cleanSqlite()
@@ -1247,8 +1242,8 @@
             self.plugins.run('clean')
 
             
-        code = hdrcode + pkgcode + xmlcode + piklcode + dbcode
-        results = hdrresults + pkgresults + xmlresults + piklresults + dbresults
+        code = hdrcode + pkgcode + xmlcode + dbcode
+        results = hdrresults + pkgresults + xmlresults + dbresults
         for msg in results:
             self.log(2, msg)
         return code, []

Index: output.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/output.py,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- output.py	29 Mar 2006 19:11:27 -0000	1.66
+++ output.py	21 Jun 2006 17:07:44 -0000	1.67
@@ -332,42 +332,6 @@
         self.dsCallback = dscb
             
     
-    def pickleRecipe(self):
-        """ don't ask """
-        
-        recipe = """
-        
-                        7 Day Sweet Pickle Recipe
-
-Recipe By     : Simply Good Cooking Pennsylvanis Dutch Style
-Serving Size  : 1    Preparation Time :0:00
-Categories    : Canned                           Pickles
-
-  Amount  Measure       Ingredient -- Preparation Method
---------  ------------  --------------------------------
-   7      pounds        cucumber
-                        water to cover
-   1      quart         vinegar
-   8      cups          sugar
-   2      tablespoons   salt
-   2      tablespoons   mixed pickle spices
-
-Wash cucumbers & cover with boiling water.  Let stand 24 hours and repeat
-process daily using fresh hot water until the 5th day.  On the 5th morning,
-cut cucumbers into 1/4 inch rings.  Prepare vinegar brine: bring vinegar,
-sugar, salt & spices to a boil.  Pour over cucmbers.  let stand 24 hours.
-The next morning, drain off brine; reheat, add cucmbers & bring to a boil.
-Pack in jars & seal while hot.
-
-                   - - - - - - - - - - - - - - - - - -
-
-NOTES : This should be processed in a boiling water bath to avoid risk of
-contamination.        
-
-
-"""
-        return recipe
-    
 
 class DepSolveProgressCallBack:
     """provides text output callback functions for Dependency Solver callback"""