From 9828fc34cf4402bfad440123477dd5b8334b626d Mon Sep 17 00:00:00 2001 From: Mike Fulbright Date: Thu, 23 May 2002 16:34:38 +0000 Subject: migrate to using rhpl log function --- anaconda | 14 ++++++++++---- anaconda_log.py | 9 +++++---- autopart.py | 5 +++-- bootloader.py | 3 ++- comps.py | 5 +++-- desktop.py | 3 ++- firewall.py | 3 ++- floppy.py | 3 ++- fsset.py | 3 ++- gui.py | 5 +++-- image.py | 3 ++- installclass.py | 5 +++-- isys/isys.py | 2 -- iutil.py | 2 +- iw/keyboard_gui.py | 3 ++- iw/upgrade_migratefs_gui.py | 3 ++- iw/upgrade_swap_gui.py | 5 +++-- iw/xconfig_gui.py | 5 +++-- kbd.py | 3 ++- monitor.py | 3 ++- network.py | 3 ++- packages.py | 5 +++-- partedUtils.py | 3 ++- partitioning.py | 5 +++-- partitions.py | 5 +++-- raid.py | 3 ++- rescue.py | 5 +++-- text.py | 5 +++-- textw/language_text.py | 5 +++-- textw/partition_text.py | 3 ++- textw/upgrade_text.py | 5 +++-- timezone.py | 3 ++- upgrade.py | 5 +++-- urlinstall.py | 3 ++- users.py | 3 ++- videocard.py | 2 +- xf86config.py | 3 ++- 37 files changed, 95 insertions(+), 58 deletions(-) diff --git a/anaconda b/anaconda index da49b6db3..e3560ee04 100755 --- a/anaconda +++ b/anaconda @@ -66,11 +66,14 @@ if len(sys.argv) > 1: # this never returns import signal, traceback, string, isys, iutil, time -from log import log -from rhpl.translate import _ + from exception import handleException import dispatch from flags import flags +from anaconda_log import anaconda_log + +from rhpl.log import log +from rhpl.translate import _ # reset python's default SIGINT handler signal.signal(signal.SIGINT, signal.SIG_DFL) @@ -239,7 +242,9 @@ if (progmode == 'rescue'): import rescue, instdata, configFileData - log.open (logFile) + anaconda_log.open (logFile) + log.handler=anaconda_log + configFile = configFileData.configFileData() configFileData = configFile.getConfigData() @@ -253,7 +258,8 @@ else: sys.stderr.write('no install method specified\n') sys.exit(1) -log.open (logFile) +anaconda_log.open (logFile) +log.handler = anaconda_log if (debug): import pdb diff --git a/anaconda_log.py b/anaconda_log.py index 9aa165fdc..f0a5424d0 100644 --- a/anaconda_log.py +++ b/anaconda_log.py @@ -2,8 +2,9 @@ # log.py - persistent debugging log service # # Matt Wilson +# Michael Fulbright # -# Copyright 2000-2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,11 +16,11 @@ import sys -class LogFile: +class Anaconda_LogFile: def __init__ (self): self.logFile = None self.logFile2 = None - + def close (self): try: self.logFile.close () @@ -61,4 +62,4 @@ class LogFile: def getFile (self): return self.logFile.fileno () -log = LogFile() +anaconda_log = Anaconda_LogFile() diff --git a/autopart.py b/autopart.py index eb86bbf53..9828f82e8 100644 --- a/autopart.py +++ b/autopart.py @@ -22,9 +22,10 @@ from partitioning import * import partedUtils import partRequests from constants import * -from rhpl.translate import _, N_ from partErrors import * -from log import log + +from rhpl.translate import _, N_ +from rhpl.log import log PARTITION_FAIL = -1 PARTITION_SUCCESS = 0 diff --git a/bootloader.py b/bootloader.py index 1dd9319c0..d5a8f22f6 100644 --- a/bootloader.py +++ b/bootloader.py @@ -24,8 +24,9 @@ import language import iutil import string from flags import flags -from log import log from constants import * + +from rhpl.log import log from rhpl.translate import _ from booty import * diff --git a/comps.py b/comps.py index a8077129e..30bb96f5b 100644 --- a/comps.py +++ b/comps.py @@ -19,10 +19,11 @@ import os from string import * import types import urllib -from rhpl.translate import _, N_ -from log import log import time +from rhpl.log import log +from rhpl.translate import _, N_ + ExcludePackages = { 'XFree86-3DLabs' : None, 'XFree86-8514' : None, 'XFree86-AGX' : None, 'XFree86-I128' : None, 'XFree86-Mach32' : None, 'XFree86-Mach64' : None, diff --git a/desktop.py b/desktop.py index 6d423f22b..73923bedc 100644 --- a/desktop.py +++ b/desktop.py @@ -15,7 +15,8 @@ import string from simpleconfig import SimpleConfigFile -from log import log + +from rhpl.log import log class Desktop (SimpleConfigFile): # diff --git a/firewall.py b/firewall.py index b6df97303..3d4cbefec 100644 --- a/firewall.py +++ b/firewall.py @@ -16,9 +16,10 @@ import os import iutil import string -from log import log from flags import flags +from rhpl.log import log + class Firewall: def __init__ (self): self.enabled = -1 diff --git a/floppy.py b/floppy.py index eb27061ad..5563d0160 100644 --- a/floppy.py +++ b/floppy.py @@ -21,8 +21,9 @@ import os import rpm import kudzu from constants import * -from log import log from flags import flags + +from rhpl.log import log from rhpl.translate import _ def probeFloppyDevice(): diff --git a/fsset.py b/fsset.py index bc34b5573..2038f53a8 100644 --- a/fsset.py +++ b/fsset.py @@ -25,7 +25,8 @@ import partitioning import partedUtils import raid import types -from log import log + +from rhpl.log import log from rhpl.translate import _, N_ defaultMountPoints = ['/', '/home', '/tmp', '/usr', '/var'] diff --git a/gui.py b/gui.py index 81f72887c..5172b25af 100755 --- a/gui.py +++ b/gui.py @@ -21,13 +21,14 @@ import sys import parted import gtk import htmlbuffer -from rhpl.translate import _, N_, utf8 from language import expandLangs from splashscreen import splashScreenPop -from log import log from flags import flags from constants import * +from rhpl.log import log +from rhpl.translate import _, N_, utf8 + StayOnScreen = "stayOnScreen" mainWindow = None diff --git a/image.py b/image.py index 53b645ea8..4f2dfbf99 100644 --- a/image.py +++ b/image.py @@ -19,8 +19,9 @@ import isys import time import kudzu import string + +from rhpl.log import log from rhpl.translate import _ -from log import log class ImageInstallMethod(InstallMethod): diff --git a/installclass.py b/installclass.py index 84405149c..115284b3f 100644 --- a/installclass.py +++ b/installclass.py @@ -17,10 +17,11 @@ import gettext_rh, os, iutil import string from xf86config import XF86Config -from rhpl.translate import _ from instdata import InstallData from partitioning import * -from log import log + +from rhpl.log import log +from rhpl.translate import _ class BaseInstallClass: # default to not being hidden diff --git a/isys/isys.py b/isys/isys.py index 780967314..61ddc0d6f 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -404,8 +404,6 @@ def ejectCdrom(device): def driveIsRemovable(device): # assume ide if starts with 'hd', and we don't have to create # device beforehand since it just reads /proc/ide - from log import log - if device[:2] == "hd": rc = (_isys.isIdeRemovable("/dev/"+device) == 1) else: diff --git a/iutil.py b/iutil.py index fe97e5e57..d39b778dc 100644 --- a/iutil.py +++ b/iutil.py @@ -15,7 +15,7 @@ import types, os, sys, isys, select, string, stat, signal import os.path -from log import log +from rhpl.log import log memoryOverhead = 0 diff --git a/iw/keyboard_gui.py b/iw/keyboard_gui.py index 6848e5035..183078913 100644 --- a/iw/keyboard_gui.py +++ b/iw/keyboard_gui.py @@ -19,8 +19,9 @@ import gobject import gtk from iw_gui import * from kbd import Keyboard -from log import log from flags import flags + +from rhpl.log import log from rhpl.translate import _, N_ class KeyboardWindow (InstallWindow): diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 573633bc0..7d45a0aec 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -19,12 +19,13 @@ from constants import * import string import isys import iutil -from log import log import upgrade from fsset import * import gui import gtk +from rhpl.log import log + class UpgradeMigrateFSWindow (InstallWindow): windowTitle = N_("Migrate Filesystems") htmlTag = "upmigfs" diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index fb7bbf936..c34094b65 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -22,10 +22,11 @@ import gobject import gtk from iw_gui import * from package_gui import queryUpgradeContinue -from rhpl.translate import _, N_ -from log import log from flags import flags +from rhpl.log import log +from rhpl.translate import _, N_ + class UpgradeSwapWindow (InstallWindow): windowTitle = N_("Upgrade Swap Partition") htmlTag = "upswapfile" diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index bf79eb263..c1b326614 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -22,10 +22,11 @@ import gui import gobject import gtk from iw_gui import * -from rhpl.translate import _, N_ from monitor import isValidSyncRange from videocard import Videocard_blacklist -from log import log + +from rhpl.log import log +from rhpl.translate import _, N_ ddc_monitor_string = _("DDC Probed Monitor") unprobed_monitor_string = _("Unprobed Monitor") diff --git a/kbd.py b/kbd.py index 77adef073..8a88359aa 100644 --- a/kbd.py +++ b/kbd.py @@ -16,7 +16,8 @@ import kudzu import string from simpleconfig import SimpleConfigFile -from log import log + +from rhpl.log import log class Keyboard (SimpleConfigFile): # the *first* item in each of these wins conflicts diff --git a/monitor.py b/monitor.py index a3c82fc8e..53d074f12 100644 --- a/monitor.py +++ b/monitor.py @@ -15,8 +15,9 @@ import string import kudzu + +from rhpl.log import log from rhpl.translate import _ -from log import log def isValidSyncRange(syncrange): diff --git a/network.py b/network.py index a36f7e675..1a9a73a78 100644 --- a/network.py +++ b/network.py @@ -21,7 +21,8 @@ import string import isys import socket import os -from log import log + +from rhpl.log import log from rhpl.translate import _, N_ def inStrRange(v, s): diff --git a/packages.py b/packages.py index 546ee77e5..1e6373bb4 100644 --- a/packages.py +++ b/packages.py @@ -23,12 +23,13 @@ import sys import string import pcmcia import fsset -from log import log from flags import flags from constants import * -from rhpl.translate import _ from syslogd import syslog +from rhpl.log import log +from rhpl.translate import _ + rpm.addMacro("_i18ndomains", "redhat-dist") def queryUpgradeContinue(intf, dir): diff --git a/partedUtils.py b/partedUtils.py index 10017bffc..c9b0ffd1f 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -23,9 +23,10 @@ import os, sys, string import fsset import iutil, isys import raid -from log import log from flags import flags from partErrors import * + +from rhpl.log import log from rhpl.translate import _ fsTypes = {} diff --git a/partitioning.py b/partitioning.py index 586008aa5..b89b9e886 100644 --- a/partitioning.py +++ b/partitioning.py @@ -30,13 +30,14 @@ import string import iutil import partedUtils import raid -from rhpl.translate import _ -from log import log from constants import * from flags import flags from partErrors import * import partRequests +from rhpl.translate import _ +from rhpl.log import log + def get_lvm_volume_group_size(request, requests, diskset): # got to add up all of physical volumes to get total size if request.physicalVolumes is None: diff --git a/partitions.py b/partitions.py index 4b125245a..2ab4cc2e0 100644 --- a/partitions.py +++ b/partitions.py @@ -23,8 +23,6 @@ import string import os, sys from constants import * -from rhpl.translate import _ -from log import log import fsset import raid @@ -33,6 +31,9 @@ import partRequests from partitioning import requestSize +from rhpl.translate import _ +from rhpl.log import log + class Partitions: """Defines all of the partition requests and delete requests.""" def __init__ (self, diskset = None): diff --git a/raid.py b/raid.py index 2a6ff4a8e..e59ccb67f 100644 --- a/raid.py +++ b/raid.py @@ -20,7 +20,8 @@ import isys import os import partitioning import partedUtils -from log import log + +from rhpl.log import log def scanForRaid(drives): """Scans for raid devices on drives. diff --git a/rescue.py b/rescue.py index b925b0e1d..06464ca9a 100644 --- a/rescue.py +++ b/rescue.py @@ -17,13 +17,14 @@ import upgrade from snack import * from constants_text import * from text import WaitWindow, OkCancelWindow -from rhpl.translate import _ import sys import os -from log import log import isys import fsset +from rhpl.log import log +from rhpl.translate import _ + class RescueInterface: def waitWindow(self, title, text): diff --git a/text.py b/text.py index 8c38d3e94..581e74b86 100644 --- a/text.py +++ b/text.py @@ -24,13 +24,14 @@ import gettext_rh import signal import parted import string -from rhpl.translate import _, cat, N_ from language import expandLangs -from log import log from flags import flags from constants_text import * from constants import * +from rhpl.log import log +from rhpl.translate import _, cat, N_ + stepToClasses = { "language" : ("language_text", "LanguageWindow"), "keyboard" : ("keyboard_text", "KeyboardWindow"), diff --git a/textw/language_text.py b/textw/language_text.py index 2c285a215..8fa7f91cb 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -16,10 +16,11 @@ import isys import iutil from snack import * from constants_text import * -from log import * -from rhpl.translate import _ from flags import flags +from rhpl.log import * +from rhpl.translate import _ + class LanguageWindow: def __call__(self, screen, textInterface, instLanguage): languages = instLanguage.available () diff --git a/textw/partition_text.py b/textw/partition_text.py index ffd58105d..ba3e0ddc6 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -27,8 +27,9 @@ from fsset import * from autopart import * from snack import * from constants_text import * + +from rhpl.log import log from rhpl.translate import _ -from log import log # sanity checking for various numeric input boxes diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index fcf632182..a125d296f 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -18,11 +18,12 @@ import upgrade from constants_text import * from snack import * from fsset import * -from log import log from flags import flags -from rhpl.translate import _ from constants import * +from rhpl.log import log +from rhpl.translate import _ + class UpgradeMigrateFSWindow: def __call__ (self, screen, thefsset): diff --git a/timezone.py b/timezone.py index 108fc0956..31b8fe425 100644 --- a/timezone.py +++ b/timezone.py @@ -12,7 +12,8 @@ # import iutil -from log import log + +from rhpl.log import log def bool(val): if val: return "true" diff --git a/upgrade.py b/upgrade.py index 14ec1f1bd..09601c92b 100644 --- a/upgrade.py +++ b/upgrade.py @@ -25,10 +25,11 @@ import string from flags import flags from fsset import * from partitioning import * -from log import log -from rhpl.translate import _ from constants import * +from rhpl.log import log +from rhpl.translate import _ + def findRootParts(intf, id, dir, chroot): if dir == DISPATCH_BACK: return diff --git a/urlinstall.py b/urlinstall.py index f75204c1f..9b680ed9d 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -22,7 +22,6 @@ import urllib import string import struct import socket -from log import log # we import these explicitly because urllib loads them dynamically, which # stinks -- and we need to have them imported for the --traceonly option @@ -30,6 +29,8 @@ import ftplib import httplib import StringIO +from rhpl.log import log + FILENAME = 1000000 DISCNUM = 1000002 diff --git a/users.py b/users.py index 6a417c648..2d36b1173 100644 --- a/users.py +++ b/users.py @@ -20,7 +20,8 @@ import crypt import os import string from flags import flags -from log import log + +from rhpl.log import log class Accounts: diff --git a/videocard.py b/videocard.py index 707e4506b..735ad87d9 100644 --- a/videocard.py +++ b/videocard.py @@ -20,7 +20,7 @@ import string import kudzu import os -from log import log +from rhpl.log import log from rhpl.translate import _ Videocard_blacklist = ["Generic VGA compatible", diff --git a/xf86config.py b/xf86config.py index d01b94d15..d3c23c352 100644 --- a/xf86config.py +++ b/xf86config.py @@ -27,8 +27,9 @@ import time import os from kbd import Keyboard from mouse import Mouse + from rhpl.translate import _ -from log import log +from rhpl.log import log XF86Config_template = """ # File generated by anaconda. -- cgit