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

modified: interface/ri_data.py

Browse Source 
modified:   interface/ri_tk_cmd.py
	modified:   xml/interface.xml
    update
        help information,add check mount point message box.
This commit is contained in:
fling
2010-11-15 10:03:05 +08:00
parent 6de793eeb9
commit 483d16568c
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/ri_data.py
View File

@@ -409,7 +409,7 @@ p_node - xml node (parent node)'''
return Raid.get_size(dev)
@staticmethod
def is_check_data(dev,dr,fs):
def check_data(dev,dr,fs):
'''check mount point is feasible. dr is mount point, dev is device'''
# check mount point is existent or not
if dr and dr in [ m.directory for m in MountPoint.dict.values() if m.device !=dev ]:

7
interface/ri_tk_cmd.py
View File

@@ -66,7 +66,6 @@ def mp_top_init():
def mp_top_ok():
''' mount dir top window OK '''
l = []
isdir_feasible = True
for itm in eval(display.var_dict['mount.list'].get()):
dev = itm.split()[0]
dev2 = display.var_dict['mp_top_dev'].get()
@@ -85,13 +84,13 @@ def mp_top_ok():
else:
fs = ' '
# check mount point is feasible
if ri_data.MountPoint.is_check_data(dev,dr,fs):
# check mount point is feasible or not
isdir_feasible = ri_data.MountPoint.check_data(dev,dr,fs)
if isdir_feasible:
s2 = dev.ljust(10) + dr.ljust(10) + fs.ljust(10) + fm.ljust(4) + sz.ljust(6) + ri_data.Partition.unit
ri_data.MountPoint.change(dev, dr, fs, fm)
l.append(s2)
else:
isdir_feasible=False
l.append(itm)
else:
l.append(itm)