Use new logging system.

9 files changed, 20 insertions, 16 deletions

diff --git a/textw/bootloader_text.py b/textw/bootloader_text.py
index cf394cd28..dc3f938be 100644
--- a/textw/bootloader_text.py
+++ b/textw/bootloader_text.py
@@ -16,11 +16,10 @@ from constants import *
 from constants_text import *
 from rhpl.translate import _
 from flags import flags
-from rhpl.log import log
 import string
 import iutil
 import bootloader
-    
+
 class BootloaderChoiceWindow:
 
     def __call__(self, screen, dispatch, bl, fsset, diskSet):
diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py
index dd7fa0327..eaad3d262 100644
--- a/textw/keyboard_text.py
+++ b/textw/keyboard_text.py
@@ -17,9 +17,11 @@ from snack import *
 from constants_text import *
 from flags import flags
 
-from rhpl.log import log
 from rhpl.translate import _
 
+import logging
+log = logging.getLogger("anaconda")
+
 class KeyboardWindow:
     def __call__(self, screen, defaultByLang, kbd):
         if flags.serial or flags.virtpconsole:
@@ -50,6 +52,6 @@ class KeyboardWindow:
 	try:
 	    isys.loadKeymap(keyboards[choice])
 	except SystemError, (errno, msg):
-	    log("Could not install keymap %s: %s" % (keyboards[choice], msg))
+	    log.error("Could not install keymap %s: %s" % (keyboards[choice], msg))
         return INSTALL_OK
 
diff --git a/textw/language_text.py b/textw/language_text.py
index 769ee1a2d..98b711005 100644
--- a/textw/language_text.py
+++ b/textw/language_text.py
@@ -19,9 +19,11 @@ from snack import *
 from constants_text import *
 from flags import flags
 
-from rhpl.log import *
 from rhpl.translate import _
 
+import logging
+log = logging.getLogger("anaconda")
+
 class LanguageWindow:
     def __call__(self, screen, textInterface, instLanguage):
         languages = instLanguage.available ()
@@ -59,13 +61,13 @@ class LanguageWindow:
             and not isys.isVioConsole()):
             # bterm to the rescue...  have to shut down the screen and
             # create a new one, though (and do a sleep)
-            log("starting bterm")
+            log.info("starting bterm")
             try:
                 screen.finish()
                 rc = isys.startBterm()
                 time.sleep(1)
             except Exception, e:
-                log("got an exception starting bterm: %s" %(e,))
+                log.error("got an exception starting bterm: %s" %(e,))
                 rc = 1
             newscreen = SnackScreen()
             textInterface.setScreen(newscreen)
diff --git a/textw/network_text.py b/textw/network_text.py
index 33a6acfc7..f39d237e2 100644
--- a/textw/network_text.py
+++ b/textw/network_text.py
@@ -23,8 +23,6 @@ from network import sanityCheckHostname
 from snack import *
 from constants_text import *
 from rhpl.translate import _
-from rhpl.log import log
-
 
 def badIPDisplay(screen, the_ip):
     ButtonChoiceWindow(screen, _("Invalid IP string"),
diff --git a/textw/packages_text.py b/textw/packages_text.py
index 8f6bceefb..1cca2cdad 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -18,6 +18,9 @@ from rhpl.translate import _
 from hdrlist import orderPackageGroups
 from hdrlist import ON_STATES, OFF_STATES
 
+import logging
+log = logging.getLogger("anaconda")
+
 class PackageGroupWindow:
 
     # Unfortunately, the checkboxtree is callback-happy
@@ -110,7 +113,7 @@ class PackageGroupWindow:
                 elif grpset.groups.has_key(pkg):
                     name = grpset.groups[pkg].name
                 else:
-                    log("unknown package %s" %(pkg,))
+                    log.warning("unknown package %s" %(pkg,))
                     continue
 		gct.append(name, pkg, pkgselection[pkg][1])
 
diff --git a/textw/partition_text.py b/textw/partition_text.py
index f60cc10c9..dd0786b15 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -29,9 +29,10 @@ from autopart import *
 from snack import *
 from constants_text import *
 
-from rhpl.log import log
 from rhpl.translate import _
 
+import logging
+log = logging.getLogger("anaconda")
 
 # sanity checking for various numeric input boxes
 def invalidInteger(str):
@@ -220,7 +221,7 @@ class PartitionWindow:
 		    if request.uniqueID in origInfoDict.keys():
 			(request.requestSize, request.currentDrive) = origInfoDict[request.uniqueID]
 	    except:
-		log("Failed to restore original info")
+		log.error("Failed to restore original info")
 
             self.intf.messageWindow(_("Error Partitioning"),
                    _("Could not allocate requested partitions: %s.") % (msg))
diff --git a/textw/progress_text.py b/textw/progress_text.py
index 5ce899306..e989ff443 100644
--- a/textw/progress_text.py
+++ b/textw/progress_text.py
@@ -16,7 +16,8 @@ from snack import *
 from constants_text import *
 from rhpl.translate import _
 
-from rhpl.log import log
+import logging
+log = logging.getLogger("anaconda")
 
 class InstallProgressWindow:
     def completePackage(self, header, timer):
@@ -210,7 +211,7 @@ class setupForInstall:
 		    flag = 1
 		    break
 
-	    log("id.methodstr = %s %s", id.methodstr, flag)
+	    log.info("id.methodstr = %s %s", id.methodstr, flag)
 	    id.setInstallProgressClass(InstallProgressWindow(screen, showdownload=flag))
 
 	return INSTALL_OK
diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py
index 217e5144c..1deb8655f 100644
--- a/textw/upgrade_text.py
+++ b/textw/upgrade_text.py
@@ -23,7 +23,6 @@ from constants import *
 import upgradeclass
 UpgradeClass = upgradeclass.InstallClass
 
-from rhpl.log import log
 from rhpl.translate import _
 
 class UpgradeMigrateFSWindow:
diff --git a/textw/zfcp_text.py b/textw/zfcp_text.py
index 7a4c9c328..f6189c68b 100644
--- a/textw/zfcp_text.py
+++ b/textw/zfcp_text.py
@@ -18,7 +18,6 @@ from constants import *
 from constants_text import *
 from rhpl.translate import _
 from flags import flags
-from rhpl.log import log
 import copy
 
 class ZFCPWindow: