Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Ubuntu User (http://www.linux-archive.org/ubuntu-user/)
-   -   Fix name collision between formats.mdraid and devicelibs.mdraid. (http://www.linux-archive.org/ubuntu-user/260801-fix-name-collision-between-formats-mdraid-devicelibs-mdraid.html)

David Lehman 03-10-2009 10:57 PM

Fix name collision between formats.mdraid and devicelibs.mdraid.
 
---
iw/raid_dialog_gui.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/iw/raid_dialog_gui.py b/iw/raid_dialog_gui.py
index efca453..d45b582 100644
--- a/iw/raid_dialog_gui.py
+++ b/iw/raid_dialog_gui.py
@@ -28,7 +28,7 @@ import gtk
import datacombo

import gui
-import storage.devicelibs.mdraid
+import storage.devicelibs.mdraid as mdraidlib
from storage.devices import *
from storage.deviceaction import *
from partition_ui_helpers_gui import *
@@ -113,7 +113,7 @@ class RaidEditor:
def raidlevelchangeCB(self, widget, sparesb):
raidlevel = widget.get_model()[widget.get_active()][0]
numparts = sparesb.get_data("numparts")
- maxspares = raid.get_raid_max_spares(raidlevel, numparts)
+ maxspares = mdraidlib.get_raid_max_spares(raidlevel, numparts)

if maxspares > 0 and raidlevel != "raid0":
adj = sparesb.get_adjustment()
@@ -398,8 +398,8 @@ class RaidEditor:
nspares = 0

if origrequest.level:
- maxspares = raid.get_raid_max_spares(origrequest.level,
- numparts)
+ maxspares = mdraidlib.get_raid_max_spares(origrequest.level,
+ numparts)
else:
maxspares = 0

@@ -418,7 +418,7 @@ class RaidEditor:


if not origrequest.exists:
- self.levelcombo = self.createRaidLevelMenu(storage.devicelibs.mdraid .raid_levels,
+ self.levelcombo = self.createRaidLevelMenu(mdraidlib.raid_levels,
origrequest.level)
lbl.set_mnemonic_widget(self.levelcombo)
else:
--
1.6.0.6

_______________________________________________
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 11:04 AM.

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