[yum-cvs] yum callback.py,1.28,1.29 cli.py,1.220,1.221

[Seth Vidal]

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

Modified Files:
	callback.py cli.py 
Log Message:

checking in changes from jbowes for rh bug 197872: fixes file log output




Index: callback.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/callback.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- callback.py	23 Jun 2006 14:26:17 -0000	1.28
+++ callback.py	10 Jul 2006 18:02:18 -0000	1.29
@@ -137,9 +137,10 @@
                     except KeyError, e:
                         pass
 
-                    pkgrep = self._logPkgString(hdr)
-                    msg = '%s: %s' % (processed, pkgrep)
-                    self.logger.info(msg)
+                    if self.output:
+                        pkgrep = self._logPkgString(hdr)
+                        msg = '%s: %s' % (processed, pkgrep)
+                        self.logger.info(msg)
 
 
         elif what == rpm.RPMCALLBACK_INST_PROGRESS:
@@ -192,7 +193,7 @@
 
         elif what == rpm.RPMCALLBACK_UNINST_STOP:
             self.total_removed += 1
-            if h not in self.installed_pkg_names:
+            if self.output 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.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- cli.py	5 Jul 2006 16:18:41 -0000	1.220
+++ cli.py	10 Jul 2006 18:02:18 -0000	1.221
@@ -674,7 +674,6 @@
         if self.conf.debuglevel < 2:
             output = 0
         cb = callback.RPMInstallCallback(output=output)
-        cb.filelog = logging.getLogger("yum.filelogging") # needed for log file output
         cb.tsInfo = self.tsInfo
 
         self.verbose_logger.log(logginglevels.INFO_2, 'Running Transaction')