[yum-cvs] yum callback.py, 1.29.2.3, 1.29.2.4 cli.py, 1.241.2.10, 1.241.2.11 yum-updatesd.py, 1.22.2.11, 1.22.2.12

[James Bowes]

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

Modified Files:
      Tag: yum-3_0_X
	callback.py cli.py yum-updatesd.py 
Log Message:
Fix for rhbz 222835 - Yet another patch for logging

Index: callback.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/callback.py,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -r1.29.2.3 -r1.29.2.4
--- callback.py	5 Dec 2006 14:39:34 -0000	1.29.2.3
+++ callback.py	3 Feb 2007 16:04:28 -0000	1.29.2.4
@@ -34,6 +34,7 @@
         self.mark = "#"
         self.marks = 27
         self.logger = logging.getLogger('yum.filelogging.RPMInstallCallback')
+        self.filelog = False
 
         self.myprocess = { TS_UPDATE : 'Updating', 
                            TS_ERASE: 'Erasing',
@@ -137,7 +138,7 @@
                     except KeyError:
                         pass
 
-                    if self.output:
+                    if self.filelog:
                         pkgrep = self._logPkgString(hdr)
                         msg = '%s: %s' % (processed, pkgrep)
                         self.logger.info(msg)
@@ -193,7 +194,7 @@
 
         elif what == rpm.RPMCALLBACK_UNINST_STOP:
             self.total_removed += 1
-            if self.output and h not in self.installed_pkg_names:
+            if self.filelog and h not in self.installed_pkg_names:
                 logmsg = _('Erased: %s' % (h))
                 self.logger.info(logmsg)
             

Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.241.2.10
retrieving revision 1.241.2.11
diff -u -r1.241.2.10 -r1.241.2.11
--- cli.py	31 Jan 2007 01:53:50 -0000	1.241.2.10
+++ cli.py	3 Feb 2007 16:04:28 -0000	1.241.2.11
@@ -450,6 +450,7 @@
         if self.conf.debuglevel < 2:
             output = 0
         cb = callback.RPMInstallCallback(output=output)
+        cb.filelog = True
         cb.tsInfo = self.tsInfo
 
         self.verbose_logger.log(yum.logginglevels.INFO_2, 'Running Transaction')

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.22.2.11
retrieving revision 1.22.2.12
diff -u -r1.22.2.11 -r1.22.2.12
--- yum-updatesd.py	31 Jan 2007 01:53:50 -0000	1.22.2.11
+++ yum-updatesd.py	3 Feb 2007 16:04:28 -0000	1.22.2.12
@@ -286,8 +286,8 @@
         self.updd.ts.check() #required for ordering
         self.updd.ts.order() # order
         cb = callback.RPMInstallCallback(output = 0)
+        cb.filelog = True
             
-        # FIXME: need to do filelog
         cb.tsInfo = self.updd.tsInfo
         try:
             self.updd.runTransaction(cb=cb)