From 31f924ac0915d75879c5e112859152292372aede Mon Sep 17 00:00:00 2001 From: fling Date: Mon, 11 Oct 2010 11:06:52 +0800 Subject: [PATCH] modified: ri_tk_cmd.py 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 --- interface/ri_tk_cmd.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index 595fdbb..e17e5d0 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -326,8 +326,15 @@ devs - raid component devices def raid_device_add(): ''' add a new raid device ''' - active = eval(display.var_dict['raid_active_devs'].get()) - spare = eval(display.var_dict['raid_spare_devs'].get()) + if display.var_dict['raid_active_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() if not active or not level: @@ -353,9 +360,16 @@ def raid_device_delete(): if r.from_os: ri_widget.MessageBox.dict["raid_delete_warning"].show() 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) - spare = list(eval(display.var_dict['raid_spare_devs'].get())) spare.extend(r.spare_components) # do not touch level display.var_dict['raid_active_devs'].set(value=tuple(active))