Ack.
On Tue, Feb 28, 2012 at 12:03:30PM +0100, Radek Vykydal wrote:
> Resolves: rhbz#500273
> ---
> iw/advanced_storage.py | 10 +++++++---
> partIntfHelpers.py | 5 +++--
> textw/add_drive_text.py | 2 +-
> 3 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/iw/advanced_storage.py b/iw/advanced_storage.py
> index a21a8e7..3918475 100644
> --- a/iw/advanced_storage.py
> +++ b/iw/advanced_storage.py
> @@ -173,6 +173,7 @@ class iSCSILoginDialog(iSCSICredentialsDialog):
>
> class iSCSIGuiWizard(pih.iSCSIWizard):
> NODE_NAME_COL = DeviceSelector.IMMUTABLE_COL + 1
> + NODE_INTERFACE_COL = DeviceSelector.IMMUTABLE_COL + 2
>
> def __init__(self):
> self.login_dialog = None
> @@ -223,7 +224,7 @@ class iSCSIGuiWizard(pih.iSCSIWizard):
>
> return self._run_dialog(self.login_dialog.dialog)
>
> - def display_nodes_dialog(self, found_nodes):
> + def display_nodes_dialog(self, found_nodes, ifaces):
> def _login_button_disabler(device_selector, login_button, checked, item):
> login_button.set_sensitive(len(device_selector.getSelected()) > 0)
>
> @@ -233,14 +234,16 @@ class iSCSIGuiWizard(pih.iSCSIWizard):
> gobject.TYPE_BOOLEAN, # visible
> gobject.TYPE_BOOLEAN, # active (checked)
> gobject.TYPE_BOOLEAN, # immutable
> - gobject.TYPE_STRING # node name
> + gobject.TYPE_STRING, # node name
> + gobject.TYPE_STRING # node interface
> )
> map(lambda node : store.append(None, (
> node, # the object
> True, # visible
> True, # active
> False, # not immutable
> - node.name)), # node's name
> + node.name, # node's name
> + ifaces.get(node.iface, node.iface))), # node's interface
> found_nodes)
>
> # create and setup the device selector
> @@ -255,6 +258,7 @@ class iSCSIGuiWizard(pih.iSCSIWizard):
> xml.get_widget("button_login"))
> ds.createSelectionCol(toggledCB=callback)
> ds.addColumn(_("Node Name"), self.NODE_NAME_COL)
> + ds.addColumn(_("Interface"), self.NODE_INTERFACE_COL)
> # attach the treeview to the dialog
> sw = xml.get_widget("nodes_scrolled_window")
> sw.add(view)
> diff --git a/partIntfHelpers.py b/partIntfHelpers.py
> index 7c318a5..c17945b 100644
> --- a/partIntfHelpers.py
> +++ b/partIntfHelpers.py
> @@ -408,7 +408,7 @@ class iSCSIWizard():
> pass
>
> @abstractmethod
> - def display_nodes_dialog(self, found_nodes):
> + def display_nodes_dialog(self, found_nodes, ifaces):
> pass
>
> @abstractmethod
> @@ -470,7 +470,8 @@ def drive_iscsi_addition(anaconda, wizard):
> anaconda.intf.messageWindow(_("iSCSI Nodes"),
> _("No iSCSI nodes to log in"))
> break
> - (rc, selected_nodes) = wizard.display_nodes_dialog(found_nodes)
> + (rc, selected_nodes) = wizard.display_nodes_dialog(found_nodes,
> + anaconda.id.storage.iscsi.ifaces)
> if not rc or len(selected_nodes) == 0:
> break
> step = STEP_LOGIN
> diff --git a/textw/add_drive_text.py b/textw/add_drive_text.py
> index 546e68d..8ba4da4 100644
> --- a/textw/add_drive_text.py
> +++ b/textw/add_drive_text.py
> @@ -187,7 +187,7 @@ class iSCSITextWizard(pih.iSCSIWizard):
> # should never stop us:
> return True
>
> - def display_nodes_dialog(self, found_nodes):
> + def display_nodes_dialog(self, found_nodes, iscsi_ifaces):
> grid_height = 4
> basic_grid = None
> if self.listbox_login.current() not in \
> --
> 1.7.4
>
> _______________________________________________
> Anaconda-devel-list mailing list
> Anaconda-devel-list@xxxxxxxxxx
> https://www.redhat.com/mailman/listinfo/anaconda-devel-list
--
David Cantrell <dcantrell@xxxxxxxxxx>
Supervisor, Installer Engineering Team
Red Hat, Inc. | Westford, MA | EST5EDT
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
