Ack.
On Sun, 2009-03-01 at 20:32 -1000, David Cantrell wrote:
> Misc syntax fixes for the new storage code. Generated these while
> trying to do a 'Create custom layout' install.
> ---
> iw/partition_dialog_gui.py | 5 +++--
> iw/partition_ui_helpers_gui.py | 11 +++++------
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
> index b64d3bf..bdaaacd 100644
> --- a/iw/partition_dialog_gui.py
> +++ b/iw/partition_dialog_gui.py
> @@ -27,6 +27,7 @@ import gtk
>
> import gui
> from storage.devices import PartitionDevice
> +from storage.deviceaction import ActionCreateFormat
> from partition_ui_helpers_gui import *
> from constants import *
>
> @@ -181,14 +182,14 @@ class PartitionEditor:
> actions.append(ActionCreateDevice(request))
> else:
> # preexisting partition, just set mount point and format flag
> - request = copy.copy(self.origrequest)
> + request = self.origrequest
> mountpoint = self.mountCombo.get_children()[0].get_text()
> if self.fsoptionsDict.has_key("formatcb") and \
> self.fsoptionsDict["formatcb"].get_active():
> fmt_class = self.fsoptionsDict["fstypeCombo"].get_active_value()
> format = fmt_class(mountpoint=mountpoint)
> if self.fsoptionsDict.has_key("lukscb") and \
> - lukscb.get_active() and \
> + self.fsoptionsDict["lukscb"].get_active() and \
> request.format.type != "luks":
> luksdev = LUKSDevice("luks%d" % self.storage.nextID,
> format=format,
> diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
> index fa18712..ad7303e 100644
> --- a/iw/partition_ui_helpers_gui.py
> +++ b/iw/partition_ui_helpers_gui.py
> @@ -30,7 +30,7 @@ import iutil
> from constants import *
> from partIntfHelpers import *
> from partedUtils import *
> -from storage.formats import device_formats, getFormat
> +from storage.formats import device_formats, getFormat, get_default_filesystem_type
>
> import gettext
> _ = lambda x: gettext.ldgettext("anaconda", x)
> @@ -185,11 +185,10 @@ def createFSTypeMenu(fstype, fstypechangeCB, mountCombo,
> store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_PYOBJECT)
> fstypecombo = datacombo.DataComboBox(store)
>
> - types = device_formats.keys()
> if availablefstypes:
> - names = availablefstypes
> + names = [ availablefstypes ]
> else:
> - names = types.keys()
> + names = device_formats.keys()
> fs = getFormat(fstype)
> if fs and fs.supported and fs.formattable:
> default = fstype
> @@ -209,7 +208,7 @@ def createFSTypeMenu(fstype, fstypechangeCB, mountCombo,
>
> if format.formattable:
> fstypecombo.append(name, device_formats[name])
> - if default and default.type == name:
> + if default == name:
> defindex = i
> defismountable = format.mountable
> i = i + 1
> @@ -324,7 +323,7 @@ def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo,
> migratecb.set_active(istruefalse(origrequest.format.migrate))
>
> # TODO: unimplemented
> - migtypes = origrequest.format.migrationTargets
> + migtypes = origrequest.format.migrationTarget
>
> maintable.attach(migratecb, 0, 1, row, row + 1)
> migfstypeCombo = createFSTypeMenu(ofstype, None, None,
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
