diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2008-12-20 11:23:16 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2008-12-20 11:23:16 +0100 |
| commit | d83270a0337370a8f8981c5b44bccae847f29749 (patch) | |
| tree | 204811ff94cd02ba877e3a2127b1741fc32d9df4 | |
| parent | d5b0c509015d0424bad95651a8d27750bdab1aff (diff) | |
| download | anaconda-d83270a0337370a8f8981c5b44bccae847f29749.tar.gz anaconda-d83270a0337370a8f8981c5b44bccae847f29749.tar.xz anaconda-d83270a0337370a8f8981c5b44bccae847f29749.zip | |
Fix a few syntax error caugh by pychecker
Fix a few syntax error caugh by pychecker.
| -rw-r--r-- | iw/lvm_dialog_gui.py | 4 | ||||
| -rw-r--r-- | iw/partition_gui.py | 3 | ||||
| -rw-r--r-- | iw/welcome_gui.py | 1 | ||||
| -rw-r--r-- | textw/network_text.py | 4 | ||||
| -rw-r--r-- | textw/welcome_text.py | 1 |
5 files changed, 8 insertions, 5 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 58793b725..25c0e6dda 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -967,7 +967,7 @@ class VolumeGroupEditor: self.dialog.destroy() self.dialog = None - def __init__(self, partitions, diskset, intf, parent, origvgrequest, isNew = 0): + def __init__(self, anaconda, partitions, diskset, intf, parent, origvgrequest, isNew = 0): self.partitions = partitions self.diskset = diskset self.origvgrequest = origvgrequest @@ -1021,7 +1021,7 @@ class VolumeGroupEditor: if not self.isNew: self.volnameEntry.set_text(self.origvgrequest.volumeGroupName) else: - self.volnameEntry.set_text(lvm.createSuggestedVGName(self.partitions)) + self.volnameEntry.set_text(lvm.createSuggestedVGName(self.partitions, anaconda.id.network)) else: lbl = createAlignedLabel(_("Volume Group Name:")) self.volnameEntry = gtk.Label(self.origvgrequest.volumeGroupName) diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 384758dda..b2c11fd55 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -1146,7 +1146,8 @@ class PartitionWindow(InstallWindow): return 1 def editLVMVolumeGroup(self, origvgrequest, isNew = 0): - vgeditor = lvm_dialog_gui.VolumeGroupEditor(self.partitions, + vgeditor = lvm_dialog_gui.VolumeGroupEditor(self.anaconda, + self.partitions, self.diskset, self.intf, self.parent, origvgrequest, isNew) diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index 8dc1a7ef6..d2e6fc5a0 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -19,6 +19,7 @@ import gtk import gui +import sys from iw_gui import * from constants import * diff --git a/textw/network_text.py b/textw/network_text.py index 0b904055b..f35510f05 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -59,7 +59,7 @@ class HostnameWindow: return INSTALL_BACK hostname = string.strip(hostEntry.value()) - neterrors = network.sanityCheckHostname(hostname) + herrors = network.sanityCheckHostname(hostname) if not hostname: ButtonChoiceWindow(_("Error with Hostname"), @@ -68,7 +68,7 @@ class HostnameWindow: buttons = [ _("OK") ]) continue - if neterrors is not None: + if herrors is not None: ButtonChoiceWindow(_("Error with Hostname"), _("The hostname \"%s\" is not valid for the " "following reason:\n\n%s") diff --git a/textw/welcome_text.py b/textw/welcome_text.py index c0f771d74..bf58b5867 100644 --- a/textw/welcome_text.py +++ b/textw/welcome_text.py @@ -20,6 +20,7 @@ from snack import * from constants_text import * from constants import * +import sys import gettext _ = lambda x: gettext.ldgettext("anaconda", x) |