[yum-git] cli.py yumcommands.py

[James Antill]

 cli.py         |    6 +++---
 yumcommands.py |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6575859180cc3d355139b2e7d03730908a8dc578
Author: James Antill <james at and.org>
Date:   Mon Mar 17 11:08:21 2008 -0400

    Fix the last commit *grumble*, stupid mondays, *grumble*

diff --git a/cli.py b/cli.py
index 5751d26..c57dca5 100644
--- a/cli.py
+++ b/cli.py
@@ -746,8 +746,8 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
         return 0, []
     
     def cleanCli(self, userlist):
-        hdrcode = pkgcode = xmlcode = dbcode = 0
-        pkgresults = hdrresults = xmlresults = dbresults = []
+        hdrcode = pkgcode = xmlcode = dbcode = expccode = 0
+        pkgresults = hdrresults = xmlresults = dbresults = expcresults = []
         if 'all' in userlist:
             self.verbose_logger.log(yum.logginglevels.INFO_2,
                 _('Cleaning up Everything'))
@@ -783,7 +783,7 @@ class YumBaseCli(yum.YumBase, output.YumOutput):
             self.plugins.run('clean')
 
         code = hdrcode + pkgcode + xmlcode + dbcode + expccode
-        results = hdrresults + pkgresults + xmlresults + dbresults + expccode
+        results = hdrresults + pkgresults + xmlresults + dbresults + expcresults
         for msg in results:
             self.verbose_logger.log(yum.logginglevels.INFO_2, msg)
         return code, []
diff --git a/yumcommands.py b/yumcommands.py
index 4682f6d..3abb8af 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -78,7 +78,7 @@ def checkGroupArg(base, basecmd, extcmds):
 
 def checkCleanArg(base, basecmd, extcmds):
     VALID_ARGS = ('headers', 'packages', 'metadata', 'dbcache', 'plugins',
-            'all')
+                  'expire-cache', 'all')
 
     if len(extcmds) == 0:
         base.logger.critical(_('Error: clean requires an option: %s') % (