From 19b32bca435075b92ea925aa4514fa0d79aa531c Mon Sep 17 00:00:00 2001 From: fling Date: Thu, 30 Sep 2010 08:44:29 +0800 Subject: [PATCH] modified: ri_tk_cmd.py bug : Not formatted, should not change filesystem of hard disk partition --- interface/ri_tk_cmd.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index ea9d4ce..73c8097 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -64,17 +64,20 @@ def mp_top_ok(): for itm in eval(display.var_dict['mount.list'].get()): dev = itm.split()[0] dev2 = display.var_dict['mp_top_dev'].get() + base_fs='' if dev == dev2: sz = display.var_dict['mp_top_size'].get() dir = display.var_dict['mp_top_dir'].get() fm = display.var_dict['mp_top_format'].get() idxs2 = ri_widget.Widget.dict['mp_top_fs'].tk_widget.curselection() - if len(idxs2): - idx2 = int(idxs2[0]) - fs = eval(display.var_dict['mp_top_fs'].get())[idx2] - else: - fs = '' - + for m in ri_data.Partition.list: + if m.device == dev2: + base_fs = m.filesystem + if len(idxs2) and fm =='yes' : + idx2 = int(idxs2[0]) + fs = eval(display.var_dict['mp_top_fs'].get())[idx2] + elif fm=='no': + fs = base_fs s2 = dev.ljust(10) + dir.ljust(10) + fs.ljust(10) + fm.ljust(4) + sz.ljust(6) l.append(s2) # make change in internal data structure