aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gaffney <agaffney@gentoo.org>2006-12-16 21:50:56 +0000
committerAndrew Gaffney <agaffney@gentoo.org>2006-12-16 21:50:56 +0000
commit67f5f5f15a605c43db82a8d3d18e7875b64390d9 (patch)
tree2f4af97c8b910b359c89e0a39f147bccba9ccba8
parent src/GLIPortage.py: (diff)
downloadgli-67f5f5f15a605c43db82a8d3d18e7875b64390d9.tar.gz
gli-67f5f5f15a605c43db82a8d3d18e7875b64390d9.tar.bz2
gli-67f5f5f15a605c43db82a8d3d18e7875b64390d9.zip
src/fe/gtk/Partitioning.py:
bail immediately if unknown partitions detected git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1553 f8877401-5920-0410-a79b-8e2d7e04ca0d
-rw-r--r--src/fe/gtk/ChangeLog4
-rw-r--r--src/fe/gtk/Partitioning.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/fe/gtk/ChangeLog b/src/fe/gtk/ChangeLog
index ad020d3..2ad2417 100644
--- a/src/fe/gtk/ChangeLog
+++ b/src/fe/gtk/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 2004 Gentoo Technologies, Inc.
# $Header: /var/cvsroot/gentoo/src/installer/src/fe/gtk/ChangeLog,v 1.233 2006/09/11 12:18:42 agaffney Exp $
+ 16 Dec 2006; Andrew Gaffney <agaffney@gentoo.org>
+ src/fe/gtk/Partitioning.py:
+ bail immediately if unknown partitions detected
+
11 Sep 2006; Andrew Gaffney <agaffney@gentoo.org>
src/fe/gtk/PartProperties.py:
pull list of supported filesystems from GLISD instead of parent
diff --git a/src/fe/gtk/Partitioning.py b/src/fe/gtk/Partitioning.py
index ae0d92c..3823164 100644
--- a/src/fe/gtk/Partitioning.py
+++ b/src/fe/gtk/Partitioning.py
@@ -420,10 +420,10 @@ disk order.
for device in self.devices:
for tmppart in self.devices[device].get_partitions():
if tmppart.get_type() == "unknown":
- msgdlg = gtk.MessageDialog(parent=self.controller.window, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format="One of your disks (%s) contains a partition (minor %s) of a type that the installer cannot currently handle. If you continue, you risk damaging your partition table. You have been warned!" % (device, str(tmppart.get_minor())))
+ msgdlg = gtk.MessageDialog(parent=self.controller.window, type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK, message_format="One of your disks (%s) contains a partition (minor %s) of a type that the installer cannot currently handle. The installer cannot continue. Click OK to exit." % (device, str(tmppart.get_minor())))
msgdlg.run()
msgdlg.destroy()
- return
+ self.controller.exit()
def deactivate(self):
parts_tmp = {}