diff options
| author | David Lehman <dlehman@redhat.com> | 2009-04-23 17:09:58 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2009-04-24 12:27:16 -0500 |
| commit | f7f5d5dfdb17d563b2b88bd5522df4d919053225 (patch) | |
| tree | 6c97dbd6d404594a77e76f91668588e419fb6c03 /iw | |
| parent | b0207f74f2af24a7c25eb1e3f173120b6eb9c7ec (diff) | |
| download | anaconda-f7f5d5dfdb17d563b2b88bd5522df4d919053225.tar.gz anaconda-f7f5d5dfdb17d563b2b88bd5522df4d919053225.tar.xz anaconda-f7f5d5dfdb17d563b2b88bd5522df4d919053225.zip | |
Fix indentation of preexisting partition handling block.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/partition_dialog_gui.py | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py index 1e99b645e..29a7ebbca 100644 --- a/iw/partition_dialog_gui.py +++ b/iw/partition_dialog_gui.py @@ -224,41 +224,41 @@ class PartitionEditor: devicetree = self.anaconda.id.storage.devicetree if self.fsoptionsDict.has_key("formatcb"): - if self.fsoptionsDict["formatcb"].get_active(): - fmt_class = self.fsoptionsDict["fstypeCombo"].get_active_value() - - # carry over exists, migrate, size, and device - # necessary for partition editor UI - format = fmt_class(mountpoint=mountpoint, - exists=origformat.exists, - size=getattr(origformat, "size", None), - device=usedev.path) - - luksdev = None - if self.fsoptionsDict.has_key("lukscb") and \ - self.fsoptionsDict["lukscb"].get_active() and \ - request.format.type != "luks": - luksdev = LUKSDevice("luks%d" % self.storage.nextID, - format=format, - parents=request) - format = getFormat("luks", - device=self.origrequest.path, - passphrase=self.storage.encryptionPassphrase) - actions.append(ActionCreateFormat(usedev, format)) - if luksdev: - actions.append(ActionCreateDevice(luksdev)) - actions.append(ActionCreateFormat(luksdev)) - elif not self.fsoptionsDict["formatcb"].get_active(): - creates = devicetree.findActions(type="create", - object="format", - path=request.format.device) - for action in creates: - devicetree.cancelAction(action) - - request.format.exists = True - - if request.format.mountable: - request.format.mountpoint = mountpoint + if self.fsoptionsDict["formatcb"].get_active(): + fmt_class = self.fsoptionsDict["fstypeCombo"].get_active_value() + + # carry over exists, migrate, size, and device + # necessary for partition editor UI + format = fmt_class(mountpoint=mountpoint, + exists=origformat.exists, + size=getattr(origformat, "size", None), + device=usedev.path) + + luksdev = None + if self.fsoptionsDict.has_key("lukscb") and \ + self.fsoptionsDict["lukscb"].get_active() and \ + request.format.type != "luks": + luksdev = LUKSDevice("luks%d" % self.storage.nextID, + format=format, + parents=request) + format = getFormat("luks", + device=self.origrequest.path, + passphrase=self.storage.encryptionPassphrase) + actions.append(ActionCreateFormat(usedev, format)) + if luksdev: + actions.append(ActionCreateDevice(luksdev)) + actions.append(ActionCreateFormat(luksdev)) + elif not self.fsoptionsDict["formatcb"].get_active(): + creates = devicetree.findActions(type="create", + object="format", + path=request.format.device) + for action in creates: + devicetree.cancelAction(action) + + request.format.exists = True + + if request.format.mountable: + request.format.mountpoint = mountpoint request.weight = self.anaconda.platform.weight(mountpoint=mountpoint, fstype=request.format.type) |