diff options
| -rw-r--r-- | autopart.py | 4 | ||||
| -rw-r--r-- | iw/partition_gui.py | 8 | ||||
| -rw-r--r-- | partitioning.py | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/autopart.py b/autopart.py index b6f9117dc..bd3f3969b 100644 --- a/autopart.py +++ b/autopart.py @@ -399,7 +399,6 @@ def deletePart(diskset, delete): disk.delete_partition(part) return part = disk.next_partition(part) - def processPartitioning(diskset, requests): # reset disk to original state @@ -472,7 +471,6 @@ def processPartitioning(diskset, requests): ## print "disk layout after everything is done" ## print diskset.diskState() - def doPartitioning(diskset, requests): for request in requests.requests: request.requestSize = request.size @@ -538,6 +536,8 @@ def doClearPartAction(id, type, cleardrives): ext = disk.extended_partition if ext and len(get_logical_partitions(disk)) == 0: delete = DeleteSpec(drive, ext.geom.start, ext.geom.end) + old = id.partrequests.getRequestByDeviceName(get_partition_name(ext)) + id.partrequests.removeRequest(old) id.partrequests.addDelete(delete) continue diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 8f6f8d205..97a8aaf54 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -463,8 +463,8 @@ class PartitionWindow(InstallWindow): entry = request.toEntry() self.fsset.add (entry) - print self.fsset.fstab() - print self.fsset.raidtab() +# print self.fsset.fstab() +# print self.fsset.raidtab() del self.parent return None @@ -1229,8 +1229,8 @@ class PartitionWindow(InstallWindow): self.diskset.openDevices() self.partitions = partitions - for part in self.partitions.requests: - print part +# for part in self.partitions.requests: +# print part # XXX PartitionRequests() should already exist and # if upgrade or going back, have info filled in diff --git a/partitioning.py b/partitioning.py index 89a72882a..3bc9041dd 100644 --- a/partitioning.py +++ b/partitioning.py @@ -499,6 +499,7 @@ class PartitionRequests: def setFromDisk(self, diskset): self.deletes = [] + self.requests = [] diskset.refreshDevices() drives = diskset.disks.keys() drives.sort() @@ -874,7 +875,4 @@ def autoCreatePartitionRequests(autoreq): requests.append(newrequest) - for r in requests: - print r - return requests |