[yum-cvs] yum cli.py,1.209,1.210

Menno Smits mjs at linux.duke.edu
Tue May 9 07:55:52 UTC 2006


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

Modified Files:
	cli.py 
Log Message:
Commited Luke's "clean" plugin hook patch.


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- cli.py	20 Apr 2006 19:26:32 -0000	1.209
+++ cli.py	9 May 2006 07:55:50 -0000	1.210
@@ -404,9 +404,9 @@
         elif self.basecmd == 'clean':
             if len(self.extcmds) == 0:
                 self.errorlog(0,
-                    _('Error: clean requires an option: headers, packages, cache, metadata, all'))
+                    _('Error: clean requires an option: headers, packages, cache, metadata, plugins, all'))
             for cmd in self.extcmds:
-                if cmd not in ['headers', 'packages', 'metadata', 'cache', 'dbcache', 'all']:
+                if cmd not in ['headers', 'packages', 'metadata', 'cache', 'dbcache', 'plugins', 'all']:
                     self.usage()
                     raise CliError
                     
@@ -1296,6 +1296,7 @@
             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
@@ -1318,6 +1319,10 @@
         if 'dbcache' in self.extcmds:
             self.log(2, 'Cleaning up database cache')
             dbcode, dbresults =  self.cleanSqlite()
+        if 'plugins' in self.extcmds:
+            self.log(2, 'Cleaning up plugins')
+            self.plugins.run('clean')
+
             
         code = hdrcode + pkgcode + xmlcode + piklcode + dbcode
         results = hdrresults + pkgresults + xmlresults + piklresults + dbresults




More information about the Yum-cvs-commits mailing list