[gentoo-commits] gli r1889 - in trunk: . src

[Andrew Gaffney (agaffney)]

Author: agaffney
Date: 2008-04-04 12:02:57 +0000 (Fri, 04 Apr 2008)
New Revision: 1889

Modified:
   trunk/ChangeLog
   trunk/src/Partitioning.py
Log:
Modify order of extended check in partitioning code so that it works

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-03 21:52:17 UTC (rev 1888)
+++ trunk/ChangeLog	2008-04-04 12:02:57 UTC (rev 1889)
@@ -2,6 +2,9 @@
 # Copyright 2005-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  04 Apr 2008; Andrew Gaffney <agaffney@g.o> src/Partitioning.py:
+  Modify order of extended check in partitioning code so that it works
+
   03 Apr 2008; Andrew Gaffney <agaffney@g.o> src/GLIPortage.py:
   sync dynamic-stage3 code in GLIPortage with GLIArch
 

Modified: trunk/src/Partitioning.py
===================================================================
--- trunk/src/Partitioning.py	2008-04-03 21:52:17 UTC (rev 1888)
+++ trunk/src/Partitioning.py	2008-04-04 12:02:57 UTC (rev 1889)
@@ -221,16 +221,17 @@
 		# 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)

-- 
gentoo-commits@l.g.o mailing list