[yum-git] cli.py yum/__init__.py

[James Antill]

 cli.py          |    8 +++++---
 yum/__init__.py |    4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit a87bfa14566c3116614ffc6c5f5704cb2211b2b3
Author: James Antill <james at and.org>
Date:   Mon Mar 17 11:02:27 2008 -0400

    Manually clean expire cache, so network manager can run when we move networks

diff --git a/cli.py b/cli.py
index 35735bc..5751d26 100644
--- a/cli.py
+++ b/cli.py
@@ -775,13 +775,15 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         if 'dbcache' in userlist or 'metadata' in userlist:
             self.logger.debug(_('Cleaning up database cache'))
             dbcode, dbresults =  self.cleanSqlite()
+        if 'expire-cache' in userlist or 'metadata' in userlist:
+            self.logger.debug(_('Cleaning up expire-cache metadata'))
+            expccode, expcresults = self.cleanExpireCache()
         if 'plugins' in userlist:
             self.logger.debug(_('Cleaning up plugins'))
             self.plugins.run('clean')
 
-            
-        code = hdrcode + pkgcode + xmlcode + dbcode
-        results = hdrresults + pkgresults + xmlresults + dbresults
+        code = hdrcode + pkgcode + xmlcode + dbcode + expccode
+        results = hdrresults + pkgresults + xmlresults + dbresults + expccode
         for msg in results:
             self.verbose_logger.log(yum.logginglevels.INFO_2, msg)
         return code, []
diff --git a/yum/__init__.py b/yum/__init__.py
index b61c20e..8d1a9bb 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -1265,6 +1265,10 @@ class YumBase(depsolve.Depsolve):
         exts = ['xml.gz', 'xml', 'cachecookie', 'mirrorlist.txt']
         return self._cleanFiles(exts, 'cachedir', 'metadata') 
 
+    def cleanExpireCache(self):
+        exts = ['cachecookie', 'mirrorlist.txt']
+        return self._cleanFiles(exts, 'cachedir', 'metadata')
+
     def _cleanFiles(self, exts, pathattr, filetype):
         filelist = []
         removed = 0