[yum-cvs] yum cli.py,1.169,1.170

Seth Vidal skvidal at login.linux.duke.edu
Thu Mar 24 08:14:16 UTC 2005


Update of /home/groups/yum/cvs/yum
In directory login:/tmp/cvs-serv31481

Modified Files:
	cli.py 
Log Message:

move the plugins call outside of cli.py and into the yum module.



Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- cli.py	21 Mar 2005 12:37:13 -0000	1.169
+++ cli.py	24 Mar 2005 08:14:14 -0000	1.170
@@ -678,26 +678,12 @@
         cb.filelog = self.filelog # needed for log file output
         cb.tsInfo = self.tsInfo
 
-        if self.plugins.run('pretrans') != 0:
-            return
-
-        # run ts
         self.log(2, 'Running Transaction')
-        
-        errors = self.ts.run(cb.callback, '')
-        if errors:
-            errstring = 'Error in Transaction: '
-            for descr in errors:
-                errstring += '  %s\n' % str(descr)
-            
-            raise yum.Errors.YumBaseError, errstring
+        self.runTransaction(cb=cb)
 
         # close things
         self.log(1, self.postTransactionOutput())
 
-        if self.plugins.run('posttrans') != 0:
-            return
-
     def gpgsigcheck(self, pkgs):
         '''Perform GPG signature verification on the given packages, installing
         keys if possible




More information about the Yum-cvs-commits mailing list