---
iw/lvm_dialog_gui.py | 2 +-
iw/netconfig_dialog.py | 1 -
iw/partition_gui.py | 10 +---------
iw/partition_ui_helpers_gui.py | 28 ++++++++++++++--------------
iw/raid_dialog_gui.py | 2 +-
iw/upgrade_migratefs_gui.py | 5 +++++
6 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py
index 5bb0732..2cee546 100644
--- a/iw/lvm_dialog_gui.py
+++ b/iw/lvm_dialog_gui.py
@@ -447,7 +447,7 @@ class VolumeGroupEditor:
if lv['name']:
lvnameEntry.set_text(lv['name'])
else:
- lvnameEntry.set_text(storage.createSuggestedLVName(self.getTempVG()))
+ lvnameEntry.set_text(self.storage.createSuggestedLVName(self.getTempVG()))
else:
lbl = createAlignedLabel(_("Logical Volume Name:"))
lvnameEntry = gtk.Label(lv['name'])
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py
index c87da21..3941d3a 100644
--- a/iw/netconfig_dialog.py
+++ b/iw/netconfig_dialog.py
@@ -27,7 +27,6 @@ from constants import *
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
-import gui
import network
import isys
diff --git a/iw/partition_gui.py b/iw/partition_gui.py
index 6ce1b11..7a2ddc6 100644
--- a/iw/partition_gui.py
+++ b/iw/partition_gui.py
@@ -129,13 +129,6 @@ class DiskStripeSlice:
return "cornsilk2"
return "cornsilk1"
- def hideOrShowText(self):
- return
- if self.box.get_bounds()[2] < self.text.get_bounds()[2]:
- self.text.hide()
- else:
- self.text.show()
-
def sliceText(self):
if self.partition.type & parted.PARTITION_EXTENDED:
return ""
@@ -178,7 +171,6 @@ class DiskStripeSlice:
fill_color='black',
anchor=gtk.ANCHOR_NW, clip=True,
clip_width=xlength-1, clip_height=yheight-1)
- self.hideOrShowText()
def __init__(self, parent, partition, treeView, editCB):
self.text = None
@@ -483,8 +475,8 @@ class DiskTreeModel(gtk.TreeStore):
# not found the partition
raise RuntimeError, "could not find partition"
- """ Return the device representing the current selection """
def getCurrentDevice(self):
+ """ Return the device representing the current selection """
selection = self.view.get_selection()
model, iter = selection.get_selected()
if not iter:
diff --git a/iw/partition_ui_helpers_gui.py b/iw/partition_ui_helpers_gui.py
index 9d7f7c5..88c44ce 100644
--- a/iw/partition_ui_helpers_gui.py
+++ b/iw/partition_ui_helpers_gui.py
@@ -280,22 +280,22 @@ def formatMigrateOptionCB(widget, data):
setMntPtComboStateFromType(ofstype, mntptcombo)
-""" createPreExistFSOptionSection: given inputs for a preexisting partition,
- create a section that will provide format and migrate options
-
- Returns the value of row after packing into the maintable,
- and a dictionary consistenting of:
- formatcb - checkbutton for 'format as new fs'
- fstype - part of format fstype menu
- fstypeMenu - part of format fstype menu
- migratecb - checkbutton for migrate fs
- migfstypeMenu - menu for migrate fs types
- lukscb - checkbutton for 'encrypt using LUKS/dm-crypt'
- resizecb - checkbutton for 'resize fs'
- resizesb - spinbutton with resize target
-"""
def createPreExistFSOptionSection(origrequest, maintable, row, mountCombo,
partitions, ignorefs=[], luksdev=None):
+ """ createPreExistFSOptionSection: given inputs for a preexisting partition,
+ create a section that will provide format and migrate options
+
+ Returns the value of row after packing into the maintable,
+ and a dictionary consistenting of:
+ formatcb - checkbutton for 'format as new fs'
+ fstype - part of format fstype menu
+ fstypeMenu - part of format fstype menu
+ migratecb - checkbutton for migrate fs
+ migfstypeMenu - menu for migrate fs types
+ lukscb - checkbutton for 'encrypt using LUKS/dm-crypt'
+ resizecb - checkbutton for 'resize fs'
+ resizesb - spinbutton with resize target
+ """
rc = {}
if luksdev:
diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index c806204..177c4c3 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -621,7 +621,7 @@ class RaidCloneDialog:
self.intf.messageWindow(_("Target Drive Error"),
_("The source drive %s cannot be "
"selected as a target drive as well.")
- % (self.sourceDev.path,),
+ % (sourceDev.path,),
custom_icon="error")
return 1
diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py
index 42397cf..62ea239 100644
--- a/iw/upgrade_migratefs_gui.py
+++ b/iw/upgrade_migratefs_gui.py
@@ -21,6 +21,8 @@
from iw_gui import *
from constants import *
+from storage.format import getFormat
+from storage.deviceaction import ActionMigrateFormat
import string
import isys
import iutil
@@ -29,6 +31,9 @@ import gtk
import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
+import logging
+log = logging.getLogger("anaconda")
+
class UpgradeMigrateFSWindow (InstallWindow):
windowTitle = N_("Migrate File Systems")
--
1.6.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
