From 0a562126d84c59a113231ae7ab38984f92d62153 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 24 Apr 2003 15:46:31 +0000 Subject: another taroon merge. tagged before as before-taroon-merge, after as after-taroon-merge this one adds s390 fixes, basic i/p series platform support, support for multiple kernels and one second stage, cmdline kickstart mode (nice for s390), some warning cleanups. --- iw/account_gui.py | 44 ++++++++++++++++++++++++-------------------- iw/bootloader_main_gui.py | 3 +++ iw/congrats_gui.py | 14 ++++++++++---- iw/installpath_gui.py | 8 ++++---- iw/partition_dialog_gui.py | 7 +++++-- 5 files changed, 46 insertions(+), 30 deletions(-) (limited to 'iw') diff --git a/iw/account_gui.py b/iw/account_gui.py index 31fbe0880..e799f6ab1 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -29,6 +29,30 @@ class AccountWindow (InstallWindow): if not self.__dict__.has_key("pw"): return None pw = self.pw.get_text() + confirm = self.confirm.get_text() + + if not pw or not confirm: + self.intf.messageWindow(_("Error with Password"), + _("You must enter your root password " + "and confirm it by typing it a second " + "time to continue."), + custom_icon="error") + raise gui.StayOnScreen + + if pw != confirm: + self.intf.messageWindow(_("Error with Password"), + _("The passwords you entered were " + "different. Please try again."), + custom_icon="error") + raise gui.StayOnScreen + + if len(pw) < 6: + self.intf.messageWindow(_("Error with Password"), + _("The root password must be at least " + "six characters long."), + custom_icon="error") + raise gui.StayOnScreen + allowed = string.digits + string.ascii_letters + string.punctuation + " " for letter in pw: if letter not in allowed: @@ -42,23 +66,6 @@ class AccountWindow (InstallWindow): self.rootPw.set (self.pw.get_text ()) return None - def rootPasswordsMatch (self, *args): - pw = self.pw.get_text () - confirm = self.confirm.get_text () - - if pw == confirm and len (pw) >= 6: - self.ics.setNextEnabled (gtk.TRUE) - self.rootStatus.set_text (_("Root password accepted.")) - else: - if not pw and not confirm: - self.rootStatus.set_text ("") - elif len (pw) < 6: - self.rootStatus.set_text (_("Root password is too short.")) - else: - self.rootStatus.set_text (_("Root passwords do not match.")) - - self.ics.setNextEnabled (gtk.FALSE) - def setFocus (self, area, data): self.pw.grab_focus () @@ -103,14 +110,12 @@ class AccountWindow (InstallWindow): pass1.set_mnemonic_widget(self.pw) self.pw.connect ("activate", self.forward) - self.pw.connect ("changed", self.rootPasswordsMatch) self.pw.connect ("map-event", self.setFocus) self.pw.set_visibility (gtk.FALSE) self.confirm = gtk.Entry (128) pass2.set_mnemonic_widget(self.confirm) self.confirm.connect ("activate", self.forward) self.confirm.set_visibility (gtk.FALSE) - self.confirm.connect ("changed", self.rootPasswordsMatch) table.attach (self.pw, 1, 2, 0, 1, gtk.FILL|gtk.EXPAND, 5) table.attach (self.confirm, 1, 2, 1, 2, gtk.FILL|gtk.EXPAND, 5) @@ -120,7 +125,6 @@ class AccountWindow (InstallWindow): # root password statusbar self.rootStatus = gtk.Label ("") - self.rootPasswordsMatch () wrapper = gtk.HBox(0, gtk.FALSE) wrapper.pack_start (self.rootStatus) box.pack_start (wrapper, gtk.FALSE) diff --git a/iw/bootloader_main_gui.py b/iw/bootloader_main_gui.py index de1273372..f0fdd249e 100644 --- a/iw/bootloader_main_gui.py +++ b/iw/bootloader_main_gui.py @@ -48,6 +48,9 @@ class MainBootloaderWindow(InstallWindow): # screen and don't worry about other options self.dispatch.skipStep("instbootloader", skip = 1) self.dispatch.skipStep("bootloaderadvanced", skip = 1) + + # kind of a hack... + self.bl.defaultDevice = None return else: self.dispatch.skipStep("instbootloader", skip = 0) diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 319a98b55..a77c7853a 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -56,13 +56,19 @@ class CongratulationWindow (InstallWindow): "rebooting your newly installed system.\n\n") % (productName,) else: bootstr = "" + + if iutil.getArch() == "s390": + floppystr = "" + else: + floppystr = _("Remove any installation media (diskettes or " + "CD-ROMs) used during the installation process " + "and press to reboot your system." + "\n\n") label = gui.WrappingLabel( _("Congratulations, the installation is complete.\n\n" - "Remove any installation media (diskettes or CD-ROMs) used during the " - "installation." - "\n\n" + "%s" "%s" "For information on Errata (updates and bug fixes), visit:\n" "\thttp://www.redhat.com/errata/\n\n" @@ -74,7 +80,7 @@ class CongratulationWindow (InstallWindow): "\thttp://www.redhat.com/apps/support/\n\n" "To register the product for support, visit:\n" "\thttp://www.redhat.com/apps/activate/\n\n" - "Click 'Exit' to reboot the system.") % (bootstr,)) + "Click 'Exit' to reboot the system.") % (floppystr, bootstr,)) hbox.pack_start (label, gtk.TRUE, gtk.TRUE) return hbox diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index a16a3554e..594f48f06 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -76,10 +76,10 @@ class InstallPathWindow (InstallWindow): vbox = gtk.VBox (gtk.FALSE, 10) vbox.set_border_width (8) - r = self.createInstallTypeOption() - b = r.render() + self.r = self.createInstallTypeOption() + b = self.r.render() - r.setToggleCallback(self.optionToggled) + self.r.setToggleCallback(self.optionToggled) # figure out current class as well as default defaultClass = None @@ -103,7 +103,7 @@ class InstallPathWindow (InstallWindow): else: self.currentClassName = currentClass.name - r.setCurrent(self.currentClassName) + self.r.setCurrent(self.currentClassName) box = gtk.VBox (gtk.FALSE) box.pack_start(b, gtk.FALSE) diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 3c78f8176..91490875b 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -450,8 +450,11 @@ class PartitionEditor: self.primonlycheckbutton.set_active(0) if self.origrequest.primary: self.primonlycheckbutton.set_active(1) - maintable.attach(self.primonlycheckbutton, 0, 2, row, row+1) - row = row + 1 + + # only show if we have something other than primary + if not self.diskset.onlyPrimaryParts(): + maintable.attach(self.primonlycheckbutton, 0, 2, row, row+1) + row = row + 1 # disable option for badblocks checking self.badblocks = None -- cgit