Looks good -- thanks.
On Sun, 2009-03-01 at 20:32 -1000, David Cantrell wrote:
> ---
> iw/lvm_dialog_gui.py | 4 ++--
> iw/partition_dialog_gui.py | 6 +++---
> iw/raid_dialog_gui.py | 8 ++++----
> kickstart.py | 4 +---
> 4 files changed, 10 insertions(+), 12 deletions(-)
>
> diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
> index ea6d7e8..6e093fe 100644
> --- a/iw/lvm_dialog_gui.py
> +++ b/iw/lvm_dialog_gui.py
> @@ -29,7 +29,7 @@ import datacombo
> import gui
> from partition_ui_helpers_gui import *
> from constants import *
> -import lvm
> +from storage.devices import *
>
> import gettext
> _ = lambda x: gettext.ldgettext("anaconda", x)
> @@ -671,7 +671,7 @@ class VolumeGroupEditor:
>
> if format:
> actions.append(ActionDestroyFormat(usedev))
> - actions.append(ActionCreateFormat(usedev, format)
> + actions.append(ActionCreateFormat(usedev, format))
> if luksdev:
> actions.append(ActionCreateDevice(luksdev))
>
> diff --git a/iw/partition_dialog_gui.py b/iw/partition_dialog_gui.py
> index 272b8bd..2fdf856 100644
> --- a/iw/partition_dialog_gui.py
> +++ b/iw/partition_dialog_gui.py
> @@ -202,7 +202,7 @@ class PartitionEditor:
> luksdev = LUKSDevice("luks%d" % self.storage.nextID,
> format=format,
> parents=request)
> - actions.append(ActionCreateDevice(luksdev)
> + actions.append(ActionCreateDevice(luksdev))
> format = getFormat("luks",
> device=self.origrequest.path,
> passphrase=self.storage.encryptionPassphrase)
> @@ -217,7 +217,7 @@ class PartitionEditor:
> if self.fsoptionsDict.has_key("resizecb") and \
> self.fsoptionsDict["resizecb"].get_active():
> size = self.fsoptionsDict["resizesb"].get_value_as_int()
> - actions.append(ActionResizeDevice(request, size)
> + actions.append(ActionResizeDevice(request, size))
> if request.format.type != "none":
> actions.append(ActionResizeFormat(request, size))
>
> @@ -229,7 +229,7 @@ class PartitionEditor:
>
> if request.format.exists and \
> getattr(request, "mountpoint", None) and \
> - self.storage.formatByDefault(request)):
> + self.storage.formatByDefault(request):
> if not queryNoFormatPreExisting(self.intf):
> continue
>
> diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
> index 8b6ed5e..8757bbc 100644
> --- a/iw/raid_dialog_gui.py
> +++ b/iw/raid_dialog_gui.py
> @@ -28,7 +28,7 @@ import gtk
> import datacombo
>
> import gui
> -from raid import availRaidLevels
> +from storage.devices import *
> from partition_ui_helpers_gui import *
> from constants import *
>
> @@ -176,7 +176,7 @@ class RaidEditor:
> self.fsoptionsDict["lukscb"].get_active() and \
> self.origrequest.format.type != "luks":
> luksdev = LUKSDevice("luks-%s" % request.name,
> - format=format
> + format=format,
> parents=self.origrequest)
> format = getFormat("luks",
> passphrase=self.storage.encryptionPassphrase)
> @@ -263,7 +263,7 @@ class RaidEditor:
> else:
> if origrequest.minor is not None:
> tstr = _("Edit RAID Device: %s") % (origrequest.path,)
> - except:
> + else:
> tstr = _("Edit RAID Device")
>
> dialog = gtk.Dialog(tstr, self.parent)
> @@ -377,7 +377,7 @@ class RaidEditor:
>
>
> if not origrequest.exists:
> - self.levelcombo = self.createRaidLevelMenu(availRaidLevels,
> + self.levelcombo = self.createRaidLevelMenu(raid_levels,
> origrequest.level)
> lbl.set_mnemonic_widget(self.levelcombo)
> else:
> diff --git a/kickstart.py b/kickstart.py
> index bc8028a..f8e5467 100644
> --- a/kickstart.py
> +++ b/kickstart.py
> @@ -26,14 +26,12 @@ import tempfile
> from flags import flags
> from constants import *
> import sys
> -import raid
> import string
> import urlgrabber.grabber as grabber
> -import lvm
> import warnings
> import upgrade
> import pykickstart.commands as commands
> -import cryptodev
> +from storage.devices import *
> import zonetab
> from pykickstart.constants import *
> from pykickstart.errors import *
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
