From a4ed7fc27f6cd43484902a6406ad8d6574e373f7 Mon Sep 17 00:00:00 2001 From: fling Date: Tue, 19 Oct 2010 15:10:29 +0800 Subject: [PATCH] modified: ri_tk_cmd.py Note : change variable dir to dr. dir is python build-in. --- interface/ri_tk_cmd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index b4dff79..15f982e 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -26,7 +26,7 @@ def mount_list_init(): # get size from Partition info 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) + s = m.device.ljust(10) + m.directory.ljust(10) + m.filesystem.ljust(10) + m.format.ljust(4) + sz.ljust(6) + ri_data.Partition.unit l.append(s) display.var_dict['mount.list'].set(value=tuple([str(i) for i in l])) @@ -76,7 +76,7 @@ def mp_top_ok(): # if format, use the filesystem just set idx2 = int(idxs2[0]) fs = eval(display.var_dict['mp_top_fs'].get())[idx2] - elif dev in ri_data.Partition.dict.keys(): + elif fm == 'no' and dev in ri_data.Partition.dict.keys(): # else use the filesystem in Partition fs = ri_data.Partition.dict[dev].filesystem else: @@ -84,7 +84,7 @@ def mp_top_ok(): s2 = dev.ljust(10) + dr.ljust(10) + fs.ljust(10) + fm.ljust(4) + sz.ljust(6) + ri_data.Partition.unit l.append(s2) # make change in internal data structure - ri_data.MountPoint.change(dev, dir, fs, fm) + ri_data.MountPoint.change(dev, dr, fs, fm) else: l.append(itm)