From 868845a6a87a3dced966f1281086293543744cff Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 17 Nov 2007 20:01:59 +0000 Subject: modify root mountpoint check in gli-dialog to use a for/else and notify the user why they're not being allowed to leave the screen git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1865 f8877401-5920-0410-a79b-8e2d7e04ca0d --- ChangeLog | 5 +++++ src/fe/dialog/gli-dialog.py | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dca9a5..1b15548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,11 @@ # Copyright 2005-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/installer/ChangeLog,v 1.686 2006/09/15 16:37:11 agaffney Exp $ + 17 Nov 2007; Andrew Gaffney + src/fe/dialog/gli-dialog.py: + modify root mountpoint check in gli-dialog to use a for/else and notify the + user why they're not being allowed to leave the screen + 17 Nov 2007; Andrew Gaffney src/templates/x86ArchitectureTemplate.py: move around parentheses to fix bug 179528 diff --git a/src/fe/dialog/gli-dialog.py b/src/fe/dialog/gli-dialog.py index 42fb5d0..c99b0c9 100755 --- a/src/fe/dialog/gli-dialog.py +++ b/src/fe/dialog/gli-dialog.py @@ -336,11 +336,11 @@ Press OK to continue""") code, choice = self._d.menu(_(u"Please define the mountpoints of your partitions for the new system. At minimum, a / mountpoint must be defined. Defining /boot and /home mountpoints is recommended."),choices=choices, cancel=_(u"Save and Continue"), height=18, width=65) if code == self._DLG_CANCEL: #Apply a check here for the existence of at least a root partition. - foundroot = False for mount in mounts: if mount['mountpoint'] == "/": - foundroot = True - if not foundroot: + break + else: + self._d.msgbox(_(u"You must select a partition to mount at / to continue")) continue try: self._install_profile.set_mounts(mounts) -- cgit v1.2.3-65-gdbad