Modify order of extended check in partitioning code so that it works

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/gli/trunk@1889 f8877401-5920-0410-a79b-8e2d7e04ca0d

2 files changed, 9 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 736c34f..cce6e9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2005-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  04 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> src/Partitioning.py:
+  Modify order of extended check in partitioning code so that it works
+
   03 Apr 2008; Andrew Gaffney <agaffney@gentoo.org> src/GLIPortage.py:
   sync dynamic-stage3 code in GLIPortage with GLIArch
 
diff --git a/src/Partitioning.py b/src/Partitioning.py
index eeced08..f7903ed 100644
--- a/src/Partitioning.py
+++ b/src/Partitioning.py
@@ -221,16 +221,17 @@ class Device:
 		# apple_bootstrap is a "magic" hfs
 		if fs == "apple_bootstrap":
 			fs = "hfs"
-		# grab relevant parted filesystemtype object
-		if fs:
-			fstype = fs_types[fs]
 		# determine correct partition type
 		parttype = "primary"
 		if fs == "extended":
 			fstype = None
 			parttype = "extended"
-		elif free_part.is_logical():
-			parttype = "logical"
+		else:
+			# grab relevant parted filesystemtype object
+			if fs:
+				fstype = fs_types[fs]
+			if free_part.is_logical():
+				parttype = "logical"
 		# figure out start/end sectors
 		start = free_part['start'] + self._megabytes_to_sectors(pregap)
 		end = start + self._megabytes_to_sectors(mb)