[PATCH 4/8] Default to CLEARPART_TYPE_NONE (#855976).

Chris Lumens clumens at redhat.com
Tue Oct 2 19:02:40 UTC 2012


With the resize dialog, we have UI for everything now and can send the user
through a path that'll allow them to make space.
---
 pyanaconda/ui/gui/spokes/storage.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index b8b24b4..70ed2f9 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -284,8 +284,6 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             self.data.autopart.autopart = True
 
         self.autopart = self.data.autopart.autopart
-
-        # FIXME:  This needs to be set to a real value via some TBD UI.
         self.clearPartType = CLEARPART_TYPE_NONE
 
     def apply(self):
@@ -296,10 +294,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # no thanks, lvm
         self.data.autopart.type = AUTOPART_TYPE_PLAIN
 
-        if self.autopart:
-            self.clearPartType = CLEARPART_TYPE_ALL
-        else:
-            self.clearPartType = CLEARPART_TYPE_NONE
+        self.clearPartType = CLEARPART_TYPE_NONE
 
         for disk in self.disks:
             if disk.name not in self.selected_disks and \
@@ -539,7 +534,7 @@ class StorageSpoke(NormalSpoke, StorageChecker):
         # show the installation options dialog
         disks = [d for d in self.disks if d.name in self.selected_disks]
         free_space = self.storage.getFreeSpace(disks=disks,
-                                               clearPartType=CLEARPART_TYPE_ALL)
+                                               clearPartType=CLEARPART_TYPE_NONE)
         disk_free = sum([f[0] for f in free_space.itervalues()])
         fs_free = sum([f[1] for f in free_space.itervalues()])
 
-- 
1.7.11.2



More information about the anaconda-patches mailing list