diff --git a/interface/ri_data.py b/interface/ri_data.py index ee64be3..8257f4e 100644 --- a/interface/ri_data.py +++ b/interface/ri_data.py @@ -49,7 +49,7 @@ class Partition: self.size = sz self.type = tp self.filesystem = fs - self.flags = fg + self.israid = fg self.from_os = fr Partition.list.append(self) @@ -84,18 +84,21 @@ class Partition: Partition.label=ret[-1] if len(ret) > 1 and ret[1].isdigit(): # ret[0] is [''] - #Number start end size type file_system flags - # 1 2.0B 33GB 1GB primary raid + #Number start end size type file_system flags + # 1 2.0B 33GB 1GB primary raid # 2 32GB 33GB 1GB primary raid, boot ... # 3 32GB 33GB 1GB primary boot, raid, lbx ... - # 4 32GB 33GB 1GB primary exit2 raid - # 5 32GB 33GB 1GB primary exit2 raid, boot ... + # 4 32GB 33GB 1GB primary exit2 raid + # 5 32GB 33GB 1GB primary exit2 raid, boot ... # 6 3.2kB 33GB 1GB primary # 7 32GB 33GB 1GB primary linx-swap - # 8 32GB 33GB 1GB primary boot, lbx ... + # 8 32GB 33GB 1GB primary boot, lbx ... # 9 32GB 33GB 1GB primary exit2 boot - #ret[1] ret[2] ret[3] ret[4] ret[5] ret[6] ret[7] + #ret[1] ret[2] ret[3] ret[4] ret[5] ret[6] ret[7] ret+=['','',''] + ret[2]=ret[2][:-len(Partition.unit)] + ret[3]=ret[3][:-len(Partition.unit)] + ret[4]=ret[4][:-len(Partition.unit)] if "raid" in ret[6:] or "raid," in ret[6:]: ret[7]='yes' if ret[6][:3].lower()=='raid' or ret[6].lower() not in fs_list: @@ -119,7 +122,7 @@ class Partition: p.attributes['size'].value.encode('ascii'),\ p.attributes['type'].value.encode('ascii'),\ p.attributes['file-system'].value.encode('ascii'),\ - p.attributes['flags'].value.encode('ascii'),\ + p.attributes['israid'].value.encode('ascii'),\ p.attributes['from_os'].value.encode('ascii')) @@ -142,21 +145,21 @@ p_node - xml node (parent node)''' size_attr = doc.createAttribute('size') type_attr = doc.createAttribute('type') fs_attr = doc.createAttribute('file-system') - flags_attr = doc.createAttribute('flags') + israid_attr = doc.createAttribute('israid') from_attr = doc.createAttribute('from_os') dev_attr.value = p.device start_attr.value = p.start size_attr.value = p.size type_attr.value = p.type fs_attr.value = p.filesystem - flags_attr.value = p.flags + israid_attr.value = p.israid from_attr.value = p.from_os pt.setAttributeNode(dev_attr) pt.setAttributeNode(start_attr) pt.setAttributeNode(size_attr) pt.setAttributeNode(type_attr) pt.setAttributeNode(fs_attr) - pt.setAttributeNode(flags_attr) + pt.setAttributeNode(israid_attr) pt.setAttributeNode(from_attr) pts.appendChild(pt) p_node.appendChild(pts) @@ -373,10 +376,10 @@ class MountPoint: for m in node.childNodes: if m.nodeType == node.ELEMENT_NODE and m.nodeName == 'mount-point': MountPoint(m.attributes['device'].value.encode('ascii'), \ - m.attributes['directory'].value.encode('ascii'), \ - m.attributes['file-system'].value.encode('ascii'), \ - m.attributes['format'].value.encode('ascii'),\ - m.attributes['size'].value.encode('ascii')) + m.attributes['directory'].value.encode('ascii'), \ + m.attributes['file-system'].value.encode('ascii'), \ + m.attributes['format'].value.encode('ascii'),\ + m.attributes['size'].value.encode('ascii')) @staticmethod def to_xml(doc, p_node): diff --git a/interface/ri_tk_cmd.py b/interface/ri_tk_cmd.py index 7914c86..1126500 100644 --- a/interface/ri_tk_cmd.py +++ b/interface/ri_tk_cmd.py @@ -31,7 +31,7 @@ def mount_list_init(): sz = ri_data.Partition.get_size(m.device) if not sz: sz = ri_data.Raid.get_size(m.device) - 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])) @@ -85,7 +85,7 @@ def mp_top_ok(): 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) + s2 = dev.ljust(10) + dir.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(dev2, dir, fs, fm) @@ -272,7 +272,7 @@ def raid_raw_init(): dev_in_raid.update(r.spare_components) raw_devs = [ p.device for p in ri_data.Partition.list - if p.flags=='yes' and p.device not in dev_in_raid ] + if p.israid=='yes' and p.device not in dev_in_raid ] display.var_dict['raid_raw_devs'].set(value=tuple(raw_devs)) def list_to_list(list_from, var_from, var_to): @@ -327,12 +327,12 @@ devs - raid component devices sz = float(p.size[:-len(unit)]) if level == '0': sz=sz*len(devs) - return "%d%s"%(sz,unit) + return str(sz) elif level == '1': - return "%d%s"%(sz,unit) + return str(sz) elif level == '5': sz=sz*(len(devs)-1) - return "%d%s"%(sz,unit) + return str(sz) def raid_device_add(): ''' add a new raid device '''