From 66e84b3604e03bdd58431ff18af6affad29e7a3a Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Sat, 7 Aug 1999 17:06:19 +0000 Subject: more partition fixes, other fixes --- text.py | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'text.py') diff --git a/text.py b/text.py index 4c73ee189..edb2a9383 100644 --- a/text.py +++ b/text.py @@ -230,16 +230,15 @@ class PartitionWindow: from newtpyfsedit import fsedit fstab = [] - for (dev, dir, reformat) in todo.mounts: - fstab.append ((dev, dir)) + for (mntpoint, (dev, fstype, reformat)) in todo.mounts.items (): + fstab.append ((dev, mntpoint)) if not todo.ddruid: todo.ddruid = fsedit(0, todo.drives.available ().keys (), fstab) dir = todo.ddruid.edit () - if dir == INSTALL_OK: - for (partition, mount, size) in todo.ddruid.getFstab (): - todo.addMount(partition, mount) - + for (partition, mount, fstype, size) in todo.ddruid.getFstab (): + todo.addMount(partition, mount, fstype) + return dir class PackageGroupWindow: @@ -545,15 +544,6 @@ class InstallInterface: def packageProgressWindow(self, total, totalSize): return InstallProgressWindow(self.screen, total, totalSize) - def exceptionWindow(self, (type, value, tb)): - import traceback - list = traceback.format_exception (type, value, tb) - text = string.joinfields (list, "") - ButtonChoiceWindow(self.screen, _("Exception occured"), - text, buttons = [_("Exit")], - width = 70) - self.screen.finish () - def __init__(self): self.screen = SnackScreen() self.welcomeText = _("Red Hat Linux (C) 1999 Red Hat, Inc.") -- cgit