From b9e34905bc504195c881201ba7b472d65577d735 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Mon, 5 May 2003 15:06:15 +0000
Subject: merge changes from taroon-branch. this merges up to
anaconda-9.0.2-1.RHEL
---
partitions.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
(limited to 'partitions.py')
diff --git a/partitions.py b/partitions.py
index 4a4bb0955..7780145a8 100644
--- a/partitions.py
+++ b/partitions.py
@@ -104,13 +104,11 @@ class Partitions:
ptype = fsset.fileSystemTypeGet("software RAID")
elif part.get_flag(parted.PARTITION_LVM) == 1:
ptype = fsset.fileSystemTypeGet("physical volume (LVM)")
- elif part.fs_type:
+ else:
ptype = partedUtils.get_partition_file_system_type(part)
- if part.fs_type.name == "linux-swap":
+ if part.fs_type and part.fs_type.name == "linux-swap":
# XXX this is a hack
format = 1
- else:
- ptype = fsset.fileSystemTypeGet("foreign")
start = part.geom.start
end = part.geom.end
--
cgit