[yum-git] Branch 'yum-3_2_X' - yum/__init__.py yum/logginglevels.py

[James Antill]

 yum/__init__.py      |    6 ++++--
 yum/logginglevels.py |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit cb102ec0ba22e00c77229ce39c414d3435956277
Author: James Antill <james at and.org>
Date:   Thu Aug 7 19:07:35 2008 -0400

    Fix copy&paste typo with syslogFacilityMap, and fix YumBase.doLoggingSetup

diff --git a/yum/__init__.py b/yum/__init__.py
index 5e58a0b..88ee98d 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -203,14 +203,16 @@ class YumBase(depsolve.Depsolve):
         return self._conf
         
 
-    def doLoggingSetup(self, debuglevel, errorlevel):
+    def doLoggingSetup(self, debuglevel, errorlevel,
+                       syslog_ident=None, syslog_facility=None):
         '''
         Perform logging related setup.
 
         @param debuglevel: Debug logging level to use.
         @param errorlevel: Error logging level to use.
         '''
-        logginglevels.doLoggingSetup(debuglevel, errorlevel)
+        logginglevels.doLoggingSetup(debuglevel, errorlevel,
+                                     syslog_ident, syslog_facility)
 
     def doFileLogSetup(self, uid, logfile):
         logginglevels.setFileLog(uid, logfile)
diff --git a/yum/logginglevels.py b/yum/logginglevels.py
index ba7f718..756e47a 100644
--- a/yum/logginglevels.py
+++ b/yum/logginglevels.py
@@ -67,7 +67,7 @@ _syslog_facility_map = { "KERN"   : syslog_module.LOG_KERN,
                          "LOCAL5" : syslog_module.LOG_LOCAL5,
                          "LOCAL6" : syslog_module.LOG_LOCAL6,
                          "LOCAL7" : syslog_module.LOG_LOCAL7,}
-def syslogFacilityMap(self, facility):
+def syslogFacilityMap(facility):
     if type(facility) == int:
         return facility
     elif facility.upper() in _syslog_facility_map: