Use new logging system.

7 files changed, 24 insertions, 17 deletions

diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 8ea593143..649a54f0b 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -28,6 +28,8 @@ from partition_ui_helpers_gui import *
 from constants import *
 import lvm
 
+import logging
+log = logging.getLogger("anaconda")
 
 class VolumeGroupEditor:
 
@@ -788,7 +790,7 @@ class VolumeGroupEditor:
 	    # have to clamp pvsize to multiple of PE
 	    availSpaceMB = availSpaceMB + pvsize
 
-        log("computeVGSize: vgsize is %s" % (availSpaceMB,))
+        log.info("computeVGSize: vgsize is %s" % (availSpaceMB,))
 	return availSpaceMB
 
     def computeLVSpaceNeeded(self, logreqs):
diff --git a/iw/package_gui.py b/iw/package_gui.py
index 2ff69de11..2de4e6ee7 100644
--- a/iw/package_gui.py
+++ b/iw/package_gui.py
@@ -33,9 +33,10 @@ from hdrlist import PKGTYPE_MANDATORY, PKGTYPE_DEFAULT, PKGTYPE_OPTIONAL
 from hdrlist import ON, MANUAL_ON, OFF, MANUAL_OFF, MANUAL_NONE
 from hdrlist import ON_STATES, OFF_STATES
 from hdrlist import Package, Group
-from rhpl.log import log
 import packages
 
+import logging
+log = logging.getLogger("anaconda")
 
 def queryUpgradeContinue(intf):
     rc = intf.messageWindow(_("Proceed with upgrade?"),
@@ -615,12 +616,12 @@ class PackageSelectionWindow (InstallWindow):
             if sel not in ON_STATES:
                 comp.selectPackage(pkg)
 	    else:
-		log("%s already selected, not selecting!" %(pkg,))
+		log.warning("%s already selected, not selecting!" %(pkg,))
 	else:
             if sel in ON_STATES:
                 comp.unselectPackage(pkg)
 	    else:
-		log("%s already unselected, not unselecting!" %(pkg,))
+		log.warning("%s already unselected, not unselecting!" %(pkg,))
 
 	if sizeLabel:
 	    self.setDetailSizeLabel(comp, sizeLabel)
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 2341bcb8b..5c3af3600 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -47,6 +47,9 @@ from partRequests import *
 from constants import *
 from partition_ui_helpers_gui import *
 
+import logging
+log = logging.getLogger("anaconda")
+
 STRIPE_HEIGHT = 35.0
 LOGICAL_INSET = 3.0
 CANVAS_WIDTH_800 = 490
@@ -990,7 +993,7 @@ class PartitionWindow(InstallWindow):
 		    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/iw/progress_gui.py b/iw/progress_gui.py
index 73a9b83e7..4de61ec22 100644
--- a/iw/progress_gui.py
+++ b/iw/progress_gui.py
@@ -28,9 +28,11 @@ from iw_gui import *
 from rhpl.translate import _, N_
 from packages import doInstall
 from constants import *
-from rhpl.log import log
 from gui import processEvents, takeScreenShot
 
+import logging
+log = logging.getLogger("anaconda")
+
 # FIXME: from redhat-config-packages.  perhaps move to common location
 def size_string (size):
     def number_format(s):
@@ -156,9 +158,9 @@ class InstallProgressWindow_NEW (InstallWindow):
         if self.numComplete > 100:
 	    if self.initialTimeEstimate is None:
 		self.initialTimeEstimate = timeest
-		log("Initial install time estimate = %s", timeest)
+		log.info("Initial install time estimate = %s", timeest)
 
-#	    log ("elapsed time, time est, remaining time =  %s %s", int(elapsedTime/60), timeest)		
+#	    log.info("elapsed time, time est, remaining time =  %s %s", int(elapsedTime/60), timeest)		
 
             if timeest < 10:
 	        timefactor = 2
@@ -168,7 +170,7 @@ class InstallProgressWindow_NEW (InstallWindow):
 	    self.remainingTimeLabel.set_text(str)
 
 	if (fractionComplete >= 1):
-	    log("Actual install time = %s", elapsedTime/60.0)
+	    log.info("Actual install time = %s", elapsedTime/60.0)
 	    self.remainingTimeLabel.set_text("")
 	    
         self.totalProgress.set_fraction(fractionComplete)
@@ -206,7 +208,7 @@ class InstallProgressWindow_NEW (InstallWindow):
                     self.adbox.add (pix)
                     self.adpix = pix
                 else:
-                    log("couldn't get a pix")
+                    log.warning("couldn't get a pix")
                 self.adbox.show_all()
                 self.pixcurnum = num + 1
 
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index d63750261..41b60378e 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -24,8 +24,6 @@ from fsset import *
 import gui
 import gtk
 
-from rhpl.log import log
-
 class UpgradeMigrateFSWindow (InstallWindow):		
     windowTitle = N_("Migrate File Systems")
     htmlTag = "upmigfs"
diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py
index e371d4ef8..09cf813e4 100644
--- a/iw/upgrade_swap_gui.py
+++ b/iw/upgrade_swap_gui.py
@@ -24,7 +24,6 @@ from iw_gui import *
 from package_gui import queryUpgradeContinue
 from flags import flags
 
-from rhpl.log import log
 from rhpl.translate import _, N_
 
 class UpgradeSwapWindow (InstallWindow):		
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index 063b52ee2..85b80d5ad 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -24,10 +24,12 @@ import gtk
 from iw_gui import *
 from constants import *
 
-from rhpl.log import log
 from rhpl.translate import _, N_
 from rhpl.monitor import isValidSyncRange
 
+import logging
+log = logging.getLogger("anaconda")
+
 from desktop import ENABLE_DESKTOP_CHOICE
 
 from gui import setupTreeViewFixupIdleHandler
@@ -83,7 +85,7 @@ class XCustomWindow (InstallWindow):
 
 
     def testPressed (self, widget, *args):
-	log("Somehow X test was attempted")
+	log.warning("Somehow X test was attempted")
 	return
     
     def numCompare (self, first, second):
@@ -183,7 +185,7 @@ class XCustomWindow (InstallWindow):
 	try:
 	    self.load_monitor_preview_pixmap(self.monitor_pixmaps[num])
 	except:
-	    log("Unable to load monitor preview #%s", num)
+	    log.warning("Unable to load monitor preview #%s", num)
 
     def display_desktop_pixmap(self, desktop):
         self.vbox4.destroy ()
@@ -863,7 +865,7 @@ class XConfigWindow (InstallWindow):
 	    self.xsetup.xhwstate.set_videocard_name(cardname)
 	    self.xsetup.xhwstate.set_videocard_card(cardname)
 	except:
-	    log("videocard-getNext: could not determine cardname for primary card %s", self.videocard.primaryCard())
+	    log.error("videocard-getNext: could not determine cardname for primary card %s", self.videocard.primaryCard())
         return None
 
     def skipToggled (self, widget, *args):