diff options
| author | Peter Jones <pjones@redhat.com> | 2007-07-11 21:49:49 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-08-06 11:40:53 -0400 |
| commit | ff20c0cbd015c3c181d96fdf0b4db5c0da0c5542 (patch) | |
| tree | 664d39be55c43611e4a2bae00b050f007baa528e /iw | |
| parent | 8bc6b6d38f0e4d0e27f46d0b17e7c1e3f0d34561 (diff) | |
| download | anaconda-ff20c0cbd015c3c181d96fdf0b4db5c0da0c5542.tar.gz anaconda-ff20c0cbd015c3c181d96fdf0b4db5c0da0c5542.tar.xz anaconda-ff20c0cbd015c3c181d96fdf0b4db5c0da0c5542.zip | |
- Fix formatting on disk sizes >1TB
- use long() some places instead of int()
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/lvm_dialog_gui.py | 17 | ||||
| -rw-r--r-- | iw/partition_gui.py | 12 |
2 files changed, 14 insertions, 15 deletions
diff --git a/iw/lvm_dialog_gui.py b/iw/lvm_dialog_gui.py index 5c996a1a9..74b67415e 100644 --- a/iw/lvm_dialog_gui.py +++ b/iw/lvm_dialog_gui.py @@ -47,9 +47,9 @@ class VolumeGroupEditor: def computeSpaceValues(self, alt_pvlist=None, usepe=None): if usepe is None: - pesize = int(self.peCombo.get_active_value()) + pesize = long(self.peCombo.get_active_value()) else: - pesize = usepe + pesize = long(usepe) if alt_pvlist is None: pvlist = self.getSelectedPhysicalVolumes(self.lvmlist.get_model()) @@ -450,7 +450,7 @@ class VolumeGroupEditor: sizeEntry = gtk.Entry(16) lbl.set_mnemonic_widget(sizeEntry) if logrequest: - sizeEntry.set_text("%d" % (logrequest.getActualSize(self.partitions, self.diskset, True),)) + sizeEntry.set_text("%Ld" % (logrequest.getActualSize(self.partitions, self.diskset, True),)) else: lbl = createAlignedLabel(_("Size (MB):")) sizeEntry = gtk.Label(str(logrequest.size)) @@ -743,7 +743,7 @@ class VolumeGroupEditor: else: self.logvolstore.set_value(iter, 1, "N/A") - self.logvolstore.set_value(iter, 2, "%d" % (size,)) + self.logvolstore.set_value(iter, 2, "%Ld" % (size,)) self.updateVGSpaceLabels() dialog.destroy() @@ -841,7 +841,7 @@ class VolumeGroupEditor: return pv def computeVGSize(self, pvlist, curpe): - availSpaceMB = 0 + availSpaceMB = 0L for id in pvlist: pvreq = self.partitions.getRequestByID(id) pvsize = pvreq.getActualSize(self.partitions, self.diskset) @@ -877,9 +877,8 @@ class VolumeGroupEditor: self.logvolstore.set_value(iter, 1, "") else: self.logvolstore.set_value(iter, 1, "N/A") - - self.logvolstore.set_value(iter, 2, "%d" % (size,)) - + + self.logvolstore.set_value(iter, 2, "%Ld" % (size,)) def updateVGSpaceLabels(self, alt_pvlist=None): if alt_pvlist == None: @@ -1125,7 +1124,7 @@ class VolumeGroupEditor: self.logvolstore.set_value(iter, 1, lvrequest.mountpoint) else: self.logvolstore.set_value(iter, 1, "") - self.logvolstore.set_value(iter, 2, "%d" % (lvrequest.getActualSize(self.partitions, self.diskset, True))) + self.logvolstore.set_value(iter, 2, "%Ld" % (lvrequest.getActualSize(self.partitions, self.diskset, True))) self.logvollist = gtk.TreeView(self.logvolstore) col = gtk.TreeViewColumn(_("Logical Volume Name"), diff --git a/iw/partition_gui.py b/iw/partition_gui.py index b1b1534c6..ca9daebbc 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -146,7 +146,7 @@ class DiskStripeSlice: rc = "Free\n" else: rc = "%s\n" % (get_partition_name(self.partition),) - rc = rc + "%d MB" % (getPartSizeMB(self.partition),) + rc = rc + "%Ld MB" % (getPartSizeMB(self.partition),) return rc def getDeviceName(self): @@ -736,7 +736,7 @@ class PartitionWindow(InstallWindow): self.tree[vgparent]['Mount Point'] = "" self.tree[vgparent]['Start'] = "" self.tree[vgparent]['End'] = "" - self.tree[vgparent]['Size (MB)'] = "%8.0f" % (rsize,) + self.tree[vgparent]['Size (MB)'] = "%Ld" % (rsize,) self.tree[vgparent]['PyObject'] = str(vgrequest.uniqueID) for lvrequest in lvmrequests[vgname]: iter = self.tree.append(vgparent) @@ -745,7 +745,7 @@ class PartitionWindow(InstallWindow): self.tree[iter]['Mount Point'] = lvrequest.mountpoint else: self.tree[iter]['Mount Point'] = "" - self.tree[iter]['Size (MB)'] = "%d" % (lvrequest.getActualSize(self.partitions, self.diskset, True),) + self.tree[iter]['Size (MB)'] = "%Ld" % (lvrequest.getActualSize(self.partitions, self.diskset, True),) self.tree[iter]['PyObject'] = str(lvrequest.uniqueID) ptype = lvrequest.fstype.getName() @@ -810,9 +810,9 @@ class PartitionWindow(InstallWindow): self.tree[iter]['Type'] = ptype self.tree[iter]['Start'] = "" self.tree[iter]['End'] = "" - self.tree[iter]['Size (MB)'] = "%d" % (request.getActualSize(self.partitions, self.diskset),) + self.tree[iter]['Size (MB)'] = "%Ld" % (request.getActualSize(self.partitions, self.diskset),) self.tree[iter]['PyObject'] = str(request.uniqueID) - + # now normal partitions drvparent = self.tree.append(None) self.tree[drvparent]['Device'] = _("Hard Drives") @@ -947,7 +947,7 @@ class PartitionWindow(InstallWindow): if size < 1.0: sizestr = "< 1" else: - sizestr = "%8.0f" % (size) + sizestr = "%Ld" % (size) self.tree[iter]['Size (MB)'] = sizestr self.tree[iter]['PyObject'] = part |