Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu Kernel Team (http://www.linux-archive.org/ubuntu-kernel-team/)
-   -   Add mpath device to selection instead of its constituents. (http://www.linux-archive.org/ubuntu-kernel-team/309957-add-mpath-device-selection-instead-its-constituents.html)

Peter Jones 01-15-2010 08:24 PM

Add mpath device to selection instead of its constituents.
 
If we've got an mpath device in FilterWindow, it should be added to the
selection, not the constituent devices for each path.
---
iw/filter_gui.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/iw/filter_gui.py b/iw/filter_gui.py
index 9b43b55..bac109b 100644
--- a/iw/filter_gui.py
+++ b/iw/filter_gui.py
@@ -364,10 +364,13 @@ class FilterWindow(InstallWindow):
# are in the list.
selected = set()
for dev in self.pages[0].ds.getSelected():
- for path in dev[PATHS_COL].split():
- selected.add(path)
+ if udev_device_is_multipath_member(dev[OBJECT_COL]):
+ selected.add(udev_device_get_multipath_name(dev[OBJECT_COL]))
+ else:
+ for path in dev[PATHS_COL].split():
+ selected.add(path)

- selected.add(udev_device_get_name(dev[OBJECT_COL]))
+ selected.add(udev_device_get_name(dev[OBJECT_COL]))

if len(selected) == 0:
self.anaconda.intf.messageWindow(_("Error"),
--
1.6.5.2

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Chris Lumens 01-20-2010 03:20 PM

Add mpath device to selection instead of its constituents.
 
This is absolutely the sort of thing we need to be doing here, and we're
going to need to do the same sort of checking for biosraid, too.

> diff --git a/iw/filter_gui.py b/iw/filter_gui.py
> index 9b43b55..bac109b 100644
> --- a/iw/filter_gui.py
> +++ b/iw/filter_gui.py
> @@ -364,10 +364,13 @@ class FilterWindow(InstallWindow):
> # are in the list.
> selected = set()
> for dev in self.pages[0].ds.getSelected():
> - for path in dev[PATHS_COL].split():
> - selected.add(path)
> + if udev_device_is_multipath_member(dev[OBJECT_COL]):
> + selected.add(udev_device_get_multipath_name(dev[OBJECT_COL]))
> + else:
> + for path in dev[PATHS_COL].split():
> + selected.add(path)

You shouldn't need these two lines anymore, since the only time we stick
anything into PATHS_COL is for mpath devices and you've already taken
care of that case.

I don't think you need to iterate over dev[PATHS_COL] like this anymore,
since the only time we stick anything into PATHS_COL is for mpath
devices and you've already taken care of that case.

>
> - selected.add(udev_device_get_name(dev[OBJECT_COL]))
> + selected.add(udev_device_get_name(dev[OBJECT_COL]))
>
> if len(selected) == 0:
> self.anaconda.intf.messageWindow(_("Error"),

Yeah, this should be sufficient.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 10:00 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.