linx/new_install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modified: ri_tk_cmd.py

Browse Source 
bug1 raid_device_add(): active can't be empty and add a messagebox for
    active
    bug2 raid_device_delete(): eval argements can't be None string
This commit is contained in:
fling
2010-10-11 11:06:52 +08:00
parent 970b867685
commit 31f924ac09
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
interface/ri_tk_cmd.py
View File

@@ -326,8 +326,15 @@ devs - raid component devices
def raid_device_add(): def raid_device_add():
''' add a new raid device ''' ''' add a new raid device '''
active = eval(display.var_dict['raid_active_devs'].get()) if display.var_dict['raid_active_devs'].get()=='':
spare = eval(display.var_dict['raid_spare_devs'].get()) ri_widget.MessageBox.dict["raid_add_active_warning"].show()
return
else:
active = eval(display.var_dict['raid_active_devs'].get())
if display.var_dict['raid_spare_devs'].get()=='':
spare=''
else:
spare = eval(display.var_dict['raid_spare_devs'].get())
level = display.var_dict['raid_level'].get() level = display.var_dict['raid_level'].get()
if not active or not level: if not active or not level:
@@ -353,9 +360,16 @@ def raid_device_delete():
if r.from_os: if r.from_os:
ri_widget.MessageBox.dict["raid_delete_warning"].show() ri_widget.MessageBox.dict["raid_delete_warning"].show()
return return
active = list(eval(display.var_dict['raid_active_devs'].get())) if display.var_dict['raid_active_devs'].get() == '':
active=[]
else:
active = list(eval(display.var_dict['raid_active_devs'].get()))
if display.var_dict['raid_spare_devs'].get()=='':
spare=[]
else:
spare = list(eval(display.var_dict['raid_spare_devs'].get()))
active.extend(r.active_components) active.extend(r.active_components)
spare = list(eval(display.var_dict['raid_spare_devs'].get()))
spare.extend(r.spare_components) spare.extend(r.spare_components)
# do not touch level # do not touch level
display.var_dict['raid_active_devs'].set(value=tuple(active)) display.var_dict['raid_active_devs'].set(value=tuple(active))