diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | dispatch.py | 2 | ||||
| -rw-r--r-- | exception.py | 3 | ||||
| -rw-r--r-- | fsset.py | 2 | ||||
| -rwxr-xr-x | gui.py | 2 | ||||
| -rw-r--r-- | installclass.py | 2 | ||||
| -rw-r--r-- | livecd.py | 6 | ||||
| -rw-r--r-- | partErrors.py | 9 | ||||
| -rw-r--r-- | rescue.py | 1 | ||||
| -rw-r--r-- | syslogd.py | 1 | ||||
| -rw-r--r-- | vnc.py | 3 |
11 files changed, 36 insertions, 13 deletions
@@ -27,13 +27,31 @@ * dispatch.py (installSteps): Revert change for writing out anaconda-ks.cfg earlier since this isn't possible on livecd. + (Dispatcher): Subclass from object so properties work. + + * exception.py (runTracebackScripts): Pass anaconda reference. * fsset.py (readFstab): Fix upgrade traceback (#296571). + (allocateLoopback): Return the correct value. + + * gui.py (ExceptionWindow.__init__): Fix syntax error. + + * installclass.py (BaseInstallClass): Subclass from object so + properties work. + + * livecd.py (LiveCDImageMethod.unmountNonFstabDirs): Take an anaconda + instance as a parameter. + + * partErrors.py (LabelError): Add from rhel5-branch. + + * syslogd.py (Syslogd.__init__): Remove pointless code. * text.py (InstallInterface.helpWindow): Pass the correct number of arguments when handling an exception. (InstallInterface.getInstallKey): Fix mapping for translation. + * vnc.py: Fix minor nitpicking errors. + 2007-09-19 Jeremy Katz <katzj@redhat.com> * livecd.py (LiveCDImageMethod.unmountNonFstabDirs): Fix syntax error. diff --git a/dispatch.py b/dispatch.py index 07f1adbd4..de3ebe9ef 100644 --- a/dispatch.py +++ b/dispatch.py @@ -115,7 +115,7 @@ installSteps = [ ("complete", ), ] -class Dispatcher: +class Dispatcher(object): def gotoPrev(self): self._setDir(DISPATCH_BACK) diff --git a/exception.py b/exception.py index 24905beac..21a1408f2 100644 --- a/exception.py +++ b/exception.py @@ -25,7 +25,6 @@ import iutil import types import bdb import rhpl -import time from string import joinfields from cPickle import Pickler from rhpl.translate import _ @@ -360,7 +359,7 @@ def handleException(anaconda, (type, value, tb)): # run kickstart traceback scripts (if necessary) try: if anaconda.isKickstart: - kickstart.runTracebackScripts() + kickstart.runTracebackScripts(anaconda) except: pass @@ -2596,7 +2596,7 @@ def allocateLoopback(file): continue break if found: - return dev + return path return None def ext2FormatFilesystem(argList, messageFile, windowCreator, mntpoint): @@ -701,7 +701,7 @@ class ExceptionWindow: textbuf.insert(iter, line) exnView.set_buffer(textbuf) - except IOError (errnum, msg): + except IOError, (errnum, msg): log.error("Could not read %s, skipping: %s" % (longTracebackFile, msg)) vbox.remove(expander) else: diff --git a/installclass.py b/installclass.py index 40102691e..e4be528b8 100644 --- a/installclass.py +++ b/installclass.py @@ -33,7 +33,7 @@ log = logging.getLogger("anaconda") from flags import flags from constants import * -class BaseInstallClass: +class BaseInstallClass(object): # default to not being hidden hidden = 0 pixmap = None @@ -98,7 +98,7 @@ class LiveCDImageMethod(installmethod.InstallMethod): custom_buttons=[_("Exit installer")]) sys.exit(0) - def unmountNonFstabDirs(self): + def unmountNonFstabDirs(self, anaconda): # unmount things that aren't listed in /etc/fstab. *sigh* dirs = ["/dev"] if flags.selinux: @@ -110,7 +110,7 @@ class LiveCDImageMethod(installmethod.InstallMethod): log.error("unable to unmount %s: %s" %(dir, e)) def postAction(self, anaconda): - self.unmountNonFstabDirs() + self.unmountNonFstabDirs(anaconda) try: anaconda.id.fsset.umountFilesystems(anaconda.rootPath, swapoff = False) @@ -157,7 +157,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend): def doPreInstall(self, anaconda): if anaconda.dir == DISPATCH_BACK: - anaconda.method.unmountNonFstabDirs() + anaconda.method.unmountNonFstabDirs(anaconda) return anaconda.id.fsset.umountFilesystems(anaconda.rootPath, swapoff = False) diff --git a/partErrors.py b/partErrors.py index e85e934dc..9aa323c1d 100644 --- a/partErrors.py +++ b/partErrors.py @@ -29,7 +29,14 @@ class PartitioningWarning(Exception): """A warning which may be ignored and still complete the installation.""" def __init__ (self, value): self.value = value - + def __str__ (self): return self.value +class LabelError(Exception): + """The device could not be labeled.""" + def __init__(self, value): + self.value = value + + def __str__(self): + return self.value @@ -25,6 +25,7 @@ import isys import iutil import fsset import shutil +import time from rhpl.translate import _ diff --git a/syslogd.py b/syslogd.py index 578893372..1971404dd 100644 --- a/syslogd.py +++ b/syslogd.py @@ -55,7 +55,6 @@ class Syslogd: fd.close() def __init__(self, root = "", output = sys.stdout, socket = "/dev/log"): - output = output filename = root + socket; self.goSyslog(output, filename) @@ -22,7 +22,6 @@ import network import isys import product import iutil -import network import socket import logging @@ -33,7 +32,7 @@ def askVncWindow(): if not os.access('/usr/bin/Xvnc', os.X_OK): return -1 - if network.hasActiveNetDev() == False: + if not network.hasActiveNetDev(): return -1 screen = SnackScreen() |