From e1794a5b5b86027373354da1cb9998861c3dcfe8 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 11 Jun 2007 13:09:22 +0000
Subject: - diskdrake   o fix 1.9TB displayed as 1TB

(backport from trunk)
---
 perl-install/NEWS         |  2 ++
 perl-install/common.pm    | 12 +++++++-----
 perl-install/install/NEWS |  2 ++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index e4828f41a..5f1d79e2d 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake
+  o fix 1.9TB displayed as 1TB
 - fix ext3 formatting with label and progress bar (#30032)
 
 Version 10.4.127 - 30 March 2007, by Olivier "blino" Blin
diff --git a/perl-install/common.pm b/perl-install/common.pm
index eb8d669d7..e03ce60b4 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -126,15 +126,17 @@ sub formatXiB {
 	($nb, $base) = ($newnb, $newbase);
 	$base >= 1024 ? ($newbase = $base / 1024) : ($newnb = $nb / 1024);
     };
-    foreach (N("B"), N("KB"), N("MB"), N("GB")) {
+    my $suffix;
+    foreach (N("B"), N("KB"), N("MB"), N("GB"), N("TB")) {
 	$decr->(); 
 	if ($newnb < 1 && $newnb * $newbase < 1) {
-	    my $v = $nb * $base;
-	    my $s = $v < 10 && int(10 * $v - 10 * int($v));
-	    return int($v) . ($s ? ".$s" : '') . $_;
+	    $suffix = $_;
+	    last;
 	}
     }
-    int($newnb * $newbase) . N("TB");
+    my $v = $nb * $base;
+    my $s = $v < 10 && int(10 * $v - 10 * int($v));
+    int($v) . ($s ? ".$s" : '') . ($suffix || N("TB"));
 }
 
 sub formatTime {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 9ebf87867..40c9b9304 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake
+  o fix 1.9TB displayed as 1TB
 - fix detecting usb drives (#13395)
 
 Version 10.4.128 - 3 April 2007, by Pascal "Pixel" Rigaux
-- 
cgit v1.2.1