Partition requests can be None when populating the tree. (#474284)
Port of commit 3568291 from rhel5-branch.
Patch attached.
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 7520651..384758d 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -882,8 +882,7 @@ class PartitionWindow(InstallWindow):
self.tree[iter]['Format'] = self.lock_pixbuf
elif request.format:
self.tree[iter]['Format'] = self.checkmark_pixbuf
-
-
+
if request and request.fstype:
self.tree[iter]['IsFormattable'] = request.fstype.isFormattable()
@@ -909,7 +908,7 @@ class PartitionWindow(InstallWindow):
else:
self.tree[iter]['Mount Point'] = ""
- if request.isEncrypted(self.partitions, True) and request.format:
+ if request and request.isEncrypted(self.partitions, True) and request.format:
self.tree[iter]['Format'] = self.lock_pixbuf
elif part.fs_type:
if request and request.fstype != None:
@@ -919,9 +918,9 @@ class PartitionWindow(InstallWindow):
else:
ptype = part.fs_type.name
- if request.isEncrypted(self.partitions, True) and request.format:
+ if request and request.isEncrypted(self.partitions, True) and request.format:
self.tree[iter]['Format'] = self.lock_pixbuf
- elif request.format:
+ elif request and request.format:
self.tree[iter]['Format'] = self.checkmark_pixbuf
else:
if request and request.fstype != None:
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
