diff options
| author | David Lehman <dlehman@redhat.com> | 2012-07-10 15:04:37 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2012-07-10 15:08:11 -0500 |
| commit | ff5159749e45d3390300f03cac9ed70d1a0aa861 (patch) | |
| tree | 287053ae4e36644457b52b22e025ab9f46c39be2 /pyanaconda | |
| parent | b5977fcfef6d235a6760faa2f1812efc9da1ecd1 (diff) | |
| download | anaconda-ff5159749e45d3390300f03cac9ed70d1a0aa861.tar.gz anaconda-ff5159749e45d3390300f03cac9ed70d1a0aa861.tar.xz anaconda-ff5159749e45d3390300f03cac9ed70d1a0aa861.zip | |
Be honest about free space on disks.
We still do the final check against the software's disk space
requirement with the assumption that the user is doing autopart.
Even when we have the tug of war, we're still checking free space
before the user has had a chance to choose between autopart and
custom. That will need to be addressed at some point.
Diffstat (limited to 'pyanaconda')
| -rw-r--r-- | pyanaconda/ui/gui/spokes/storage.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index cdafae1a1..e0d98b012 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -273,7 +273,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): self.autopart = self.data.autopart.autopart # FIXME: This needs to be set to a real value via some TBD UI. - self.clearPartType = CLEARPART_TYPE_LINUX + self.clearPartType = CLEARPART_TYPE_NONE def apply(self): self.data.ignoredisk.onlyuse = self.selected_disks[:] @@ -450,8 +450,7 @@ class StorageSpoke(NormalSpoke, StorageChecker): free = Size(bytes=0) # pass in our disk list so hidden disks' free space is available - free_space = self.storage.getFreeSpace(disks=self.disks, - clearPartType=self.clearPartType) + free_space = self.storage.getFreeSpace(disks=self.disks) selected = [d for d in self.disks if d.name in self.selected_disks] for disk in selected: @@ -518,7 +517,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=self.clearPartType) + clearPartType=CLEARPART_TYPE_ALL) disk_free = sum([f[0] for f in free_space.itervalues()]) fs_free = sum([f[1] for f in free_space.itervalues()]) required_space = self.payload.spaceRequired |