modified: ri_data.py

modified:   ri_func_dep.py
	modified:   ri_main.py
	modified:   ri_tk_cmd.py
     Because the function sort() return value is not a list. it is return <type 'NoneType'>.so use for k in ri_data.MountPoint.dict{}.keys().sort() must be throw a exception

interface/ri_tk_cmd.py

@@ -20,9 +20,11 @@ def mount_list_init():
     ''' initialize mount list '''
     l = []
     ri_data.MountPoint.init_from_internal()
-    for d in ri_data.MountPoint.dict.keys().sort():
+    M_keys = ri_data.MountPoint.dict.keys()
+    M_keys.sort()
+    for d in M_keys:
         # get size from Partition info
-        sz = MountPoint.get_size(d)
+        sz = ri_data.MountPoint.get_size(d)
         m = ri_data.MountPoint.dict[d]
         s = m.device.ljust(10) + m.directory.ljust(10) + m.filesystem.ljust(10) + m.format.ljust(4) + sz.ljust(6)
         l.append(s)
@@ -45,7 +47,7 @@ def mp_top_init():
         dr = mp.directory
         fs  = mp.filesystem
         fm  = mp.format
-        sz  = MountPoint.get_size(dev)
+        sz  = ri_data.MountPoint.get_size(dev)
         display.var_dict['mp_top_dev'].set(value=dev)
         display.var_dict['mp_top_size'].set(value=sz)
         display.var_dict['mp_top_dir'].set(value=dr)
@@ -261,7 +263,8 @@ def raid_raw_init():
         dev_in_raid = ri_data.Raid.dev_in_raid()
 
         raw_devs = [ d for d in ri_data.Partition.dict.keys() 
-                     if re.search('raid', ri_data.Partition.dict[d].flags) and d not in dev_in_raid ].sort()
+                     if re.search('raid', ri_data.Partition.dict[d].flags) and d not in dev_in_raid ]
+        raw_devs.sort()
         display.var_dict['raid_raw_devs'].set(value=tuple(raw_devs))
 
 def list_to_list(list_from, var_from, var_to):
@@ -278,7 +281,8 @@ def list_to_list(list_from, var_from, var_to):
             l_to = list(eval(display.var_dict[var_to].get()))
             l_to.append(itm)
         else:
-            l_to = [ itm ].sort()
+            l_to = [ itm ]
+            l_to.sort()
         display.var_dict[var_to].set(value=tuple(l_to))
     
 def raid_raw_to_active():
@@ -299,7 +303,11 @@ def raid_spare_to_raw():
 
 def raid_device_init():
     ''' initialize raid device list '''
-    raid_devs = [ k for k in ri_data.Raid.keys() ].sort()
+    raid_devs = [ k for k in ri_data.Raid.dict.keys() ]
+    raid_devs.sort()
+    if not raid_devs:
+        raid_devs=[]
+
     display.var_dict['raid_devs'].set(value=tuple(raid_devs))
 
 def raid_device_add():