diff options
| -rw-r--r-- | ChangeLog | 18 | ||||
| -rw-r--r-- | iw/partition_gui.py | 10 | ||||
| -rw-r--r-- | partIntfHelpers.py | 5 | ||||
| -rw-r--r-- | textw/partition_text.py | 4 |
4 files changed, 28 insertions, 9 deletions
@@ -1,3 +1,21 @@ +2005-04-16 Jeremy Katz <katzj@redhat.com> + + * textw/partition_text.py (AutoPartitionWindow.__call__): Check + for a drive being selected (#124296) + * partIntfHelpers.py (mustHaveSelectedDrive): Add UI helper for + selected drives error. + * iw/partition_gui.py (AutoPartitionWindow.getNext): Use helper. + + * loader2/kickstart.c: Allow specifying 'mediacheck' in ks.cfg to + specify mediacheck. + * loader2/kickstart.h: Define constant. + * kickstart.py (KickstartBase.readKickstart): Define no-op for + 'mediacheck' keyword for stage2 + + * loader2/method.c (queryIsoMediaCheck): Allow mediacheck for + kickstart if 'mediacheck' passed on the command line. (#116429) + * loader2/cdinstall.c (queryCDMediaCheck): Likewise. + 2005-04-15 Chris Lumens <clumens@redhat.com> * anaconda.spec: Bump version. diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 11a22f232..2341bcb8b 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -1438,15 +1438,7 @@ class AutoPartitionWindow(InstallWindow): iter = model.iter_next(iter) if len(allowdrives) < 1: - dlg = gtk.MessageDialog(self.parent, 0, gtk.MESSAGE_ERROR, - gtk.BUTTONS_OK, - _("You need to select at least one " - "hard drive to have %s installed " - "onto.") % (productName,)) - gui.addFrame(dlg) - dlg.show_all() - rc = dlg.run() - dlg.destroy() + mustHaveSelectedDrive(self.intf) raise gui.StayOnScreen self.partitions.autoClearPartDrives = allowdrives diff --git a/partIntfHelpers.py b/partIntfHelpers.py index 3773222ef..fef7796e5 100644 --- a/partIntfHelpers.py +++ b/partIntfHelpers.py @@ -396,6 +396,11 @@ def checkForSwapNoMatch(intf, diskset, partitions): partedUtils.set_partition_file_system_type(part, request.fstype) + +def mustHaveSelectedDrive(intf): + txt =_("You need to select at least one hard drive to have %s installed " + "onto.") % (productName,) + intf.messageWindow(_("Error"), txt, custom_icon="error") def queryNoFormatPreExisting(intf): """Ensure the user wants to use a partition without formatting.""" diff --git a/textw/partition_text.py b/textw/partition_text.py index cc4afaba7..2282815f2 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1576,6 +1576,10 @@ class AutoPartitionWindow: return INSTALL_BACK + if len(self.drivelist.getSelection()) < 1: + mustHaveSelectedDrive(intf) + continue + partitions.autoClearPartType = typebox.current() partitions.autoClearPartDrives = self.drivelist.getSelection() |