diff options
| -rw-r--r-- | floppy.py | 8 | ||||
| -rw-r--r-- | iw/bootdisk_gui.py | 23 | ||||
| -rw-r--r-- | textw/bootdisk_text.py | 32 |
3 files changed, 32 insertions, 31 deletions
@@ -59,6 +59,10 @@ def makeBootdisk (intf, floppyDevice, hdList, instPath): try: fd = os.open(file, os.O_RDONLY) except: + intf.messageWindow( _("Error"), + _("An error occured while making the boot disk. " + "Please make sure that there is a formatted floppy " + "in the first floppy drive.")) return DISPATCH_BACK os.close(fd) @@ -78,5 +82,9 @@ def makeBootdisk (intf, floppyDevice, hdList, instPath): w.pop() if rc: + intf.messageWindow( _("Error"), + _("An error occured while making the boot disk. " + "Please make sure that there is a formatted floppy " + "in the first floppy drive.")) return DISPATCH_BACK diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py index 029a9740b..e627a6d2c 100644 --- a/iw/bootdisk_gui.py +++ b/iw/bootdisk_gui.py @@ -51,19 +51,16 @@ class BootdiskWindow (InstallWindow): label = None - if dir == DISPATCH_FORWARD: - text = _("The boot disk allows you to boot your Red Hat " - "Linux system from a floppy diskette.\n\n" - "Please remove any diskettes from the floppy drive and " - "insert a blank diskette. All data will be ERASED " - "during creation of the boot disk.") - if fsset.rootOnLoop(): - text = text + _("\n\nA boot disk is REQUIRED to boot a " - "partitionless install.") - else: - text = _("An error occured while making the boot disk. " - "Please make sure that there is a formatted floppy " - "in the first floppy drive.") + text = _("The boot disk allows you to boot your Red Hat " + "Linux system from a floppy diskette.\n\n" + "Please remove any diskettes from the floppy drive and " + "insert a blank diskette. All data will be ERASED " + "during creation of the boot disk.") + + if fsset.rootOnLoop(): + text = text + _("\n\nA boot disk is REQUIRED to boot a " + "partitionless install.") + label = GtkLabel (text) label.set_line_wrap (TRUE) diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py index c9dbe959a..0607300ea 100644 --- a/textw/bootdisk_text.py +++ b/textw/bootdisk_text.py @@ -71,24 +71,20 @@ class MakeBootDiskWindow: if disp.stepInSkipList("makebootdisk"): return INSTALL_NOOP - if dir == DISPATCH_FORWARD: - text = _("The boot disk allows you to boot " - "your Red Hat Linux system from a " - "floppy diskette.\n\n" - "Please remove any diskettes from the " - "floppy drive and insert a blank " - "diskette. All data will be ERASED " - "during creation of the boot disk.") - if fsset.rootOnLoop(): - text = text + _("\n\nA boot disk is REQUIRED to boot a " - "partitionless install.") - rc = ButtonChoiceWindow (screen, _("Boot Disk"), - text, buttons, help = "insertbootdisk") - else: - rc = ButtonChoiceWindow (screen, _("Error"), - _("An error occured while making the boot disk. " - "Please make sure that there is a formatted floppy " - "in the first floppy drive."), buttons) + text = _("The boot disk allows you to boot " + "your Red Hat Linux system from a " + "floppy diskette.\n\n" + "Please remove any diskettes from the " + "floppy drive and insert a blank " + "diskette. All data will be ERASED " + "during creation of the boot disk.") + + if fsset.rootOnLoop(): + text = text + _("\n\nA boot disk is REQUIRED to boot a " + "partitionless install.") + + rc = ButtonChoiceWindow (screen, _("Boot Disk"), + text, buttons, help = "insertbootdisk") if rc == string.lower (_("Skip")): disp.skipStep("makebootdisk") |