src/fe/gtk/PartProperties.py:

  pull list of supported filesystems from GLISD instead of parent

3 files changed, 20 insertions, 13 deletions

diff --git a/src/installer/src/GLIStorageDevice.py b/src/installer/src/GLIStorageDevice.py
index e5d60faf92..8fa2b4802b 100644
--- a/src/installer/src/GLIStorageDevice.py
+++ b/src/installer/src/GLIStorageDevice.py
@@ -15,11 +15,11 @@ MEGABYTE = 1024 * 1024
 FREE_MINOR_FRAC_PRI = 1.0/32.0
 FREE_MINOR_FRAC_LOG = 1.0/8.0
 
-supported_types = {
-  'all':   ( 'ext2', 'ext3', 'linux-swap' ),
-  'x86':   ( 'ntfs', 'fat16', 'fat32', 'xfs', 'jfs', 'reiserfs' ),
-  'amd64': ( 'ntfs', 'fat16', 'fat32', 'xfs', 'jfs', 'reiserfs' ),
-  'ppc':   ( 'reiserfs', 'apple-bootstrap', 'hfs', 'hfs+' )
+supported_filesystems = {
+  'all':   ( 'ext2', 'ext3', 'linux-swap', 'xfs', 'jfs', 'reiserfs' ),
+  'x86':   ( 'ntfs', 'fat16', 'fat32' ),
+  'amd64': ( 'ntfs', 'fat16', 'fat32' ),
+  'ppc':   ( 'reiserfs', 'apple_bootstrap', 'hfs' )
 }
 
 labelinfo = {
@@ -89,8 +89,8 @@ class Device:
 
 	##
 	# Returns list of supported filesystems based on arch
-	def get_supported_types(self):
-		return supported_types['all'] + supported_types[self._arch]
+	def get_supported_filesystems(self):
+		return supported_filesystems['all'] + supported_filesystems[self._arch]
 
 	##
 	# Sets disk geometry info from disk. This function is used internally by __init__()
diff --git a/src/installer/src/fe/gtk/ChangeLog b/src/installer/src/fe/gtk/ChangeLog
index 9e36692b95..ad020d32b2 100644
--- a/src/installer/src/fe/gtk/ChangeLog
+++ b/src/installer/src/fe/gtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for Gentoo Linux Installer
 # Copyright 2004 Gentoo Technologies, Inc.
-# $Header: /var/cvsroot/gentoo/src/installer/src/fe/gtk/ChangeLog,v 1.232 2006/09/10 19:17:05 agaffney Exp $
+# $Header: /var/cvsroot/gentoo/src/installer/src/fe/gtk/ChangeLog,v 1.233 2006/09/11 12:18:42 agaffney Exp $
+
+  11 Sep 2006; Andrew Gaffney <agaffney@gentoo.org>
+  src/fe/gtk/PartProperties.py:
+  pull list of supported filesystems from GLISD instead of parent
 
   10 Sep 2006; Andrew Gaffney <agaffney@gentoo.org>
   src/fe/gtk/Partitioning.py:
diff --git a/src/installer/src/fe/gtk/PartProperties.py b/src/installer/src/fe/gtk/PartProperties.py
index 71d4ca6f40..a329a79ec2 100644
--- a/src/installer/src/fe/gtk/PartProperties.py
+++ b/src/installer/src/fe/gtk/PartProperties.py
@@ -31,6 +31,7 @@ class PartProperties(gtk.Window):
 			self.min_size = self.cur_size
 			self.max_size = self.cur_size
 		self.sync_slider_to_text = True
+		self.supported_filesystems = self.controller.self.devices[self.device].get_supported_filesystems()
 
 		self.connect("delete_event", self.delete_event)
 		self.connect("destroy", self.destroy_event)
@@ -126,7 +127,8 @@ class PartProperties(gtk.Window):
 		info_partition_fs.set_alignment(0.0, 0.5)
 		part_info_table.attach(info_partition_fs, 0, 1, 3, 4)
 		self.resize_info_part_filesystem = gtk.combo_box_new_text()
-		for fs in self.controller.supported_filesystems:
+#		for fs in self.controller.supported_filesystems:
+		for fs in self.supported_filesystems:
 			self.resize_info_part_filesystem.append_text(fs)
 		self.resize_info_part_filesystem.set_active(0)
 		self.resize_info_part_filesystem.connect("changed", self.filesystem_changed)
@@ -194,7 +196,8 @@ class PartProperties(gtk.Window):
 				self.resize_info_part_type.set_active(1)
 			self.resize_info_part_type.set_sensitive(False)
 			self.resize_info_part_filesystem.set_sensitive(False)
-			for i, fs in enumerate(self.controller.supported_filesystems):
+#			for i, fs in enumerate(self.controller.supported_filesystems):
+			for i, fs in enumerate(self.supported_filesystems:
 				if fs == self.fstype:
 					self.resize_info_part_filesystem.set_active(i)
 					break
@@ -231,7 +234,7 @@ class PartProperties(gtk.Window):
 			resp = msgdlg.run()
 			msgdlg.destroy()
 			return
-		if self.controller.supported_filesystems[self.resize_info_part_filesystem.get_active()] == "linux-swap":
+		if self.supported_filesystems[self.resize_info_part_filesystem.get_active()] == "linux-swap":
 			self.part_mount_point_entry.set_text("")
 			self.part_mount_opts_entry.set_text("")
 		else:
@@ -247,7 +250,7 @@ class PartProperties(gtk.Window):
 			if self.resize_info_part_type.get_active() == 1 and self.controller.devices[self.device].get_extended_partition() == 0: # Logical and no extended partition
 				self.controller.devices[self.device].add_partition(self.minor, self.max_size, 0, 0, "extended")
 				self.minor = 4 + FREE_MINOR_FRAC_LOG
-			fstype = self.controller.supported_filesystems[self.resize_info_part_filesystem.get_active()]
+			fstype = self.supported_filesystems[self.resize_info_part_filesystem.get_active()]
 			new_minor = self.controller.devices[self.device].add_partition(self.minor, part_size, 0, 0, fstype, mountpoint=self.part_mount_point_entry.get_text(), mountopts=self.part_mount_opts_entry.get_text())
 			self.controller.draw_part_box()
 			self.controller.part_selected(None, self.device, new_minor)
@@ -316,7 +319,7 @@ class PartProperties(gtk.Window):
 			self.resize_hpaned.set_position(self.resize_hpaned.get_position())
 
 	def filesystem_changed(self, widget, data=None):
-		fs = self.controller.supported_filesystems[self.resize_info_part_filesystem.get_active()]
+		fs = self.supported_filesystems[self.resize_info_part_filesystem.get_active()]
 		self.resize_part_space.set_colors(self.controller.colors[fs], self.controller.colors[fs])
 		if self.fstype == "free": self.resize_part_space.get_child().expose_event(None, None)
 		if fs == "linux-swap":