summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-06-11 13:07:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-06-11 13:07:30 +0000
commit17f7498cb36b2b155f4e005b2ab1be1aa089cd54 (patch)
treea6002043de1473c99607ddb2c9f823b544ec642e /perl-install
parent7eba8f8646a98f8a4c90d3bbf87b870a0ae4580f (diff)
downloaddrakx-17f7498cb36b2b155f4e005b2ab1be1aa089cd54.tar
drakx-17f7498cb36b2b155f4e005b2ab1be1aa089cd54.tar.gz
drakx-17f7498cb36b2b155f4e005b2ab1be1aa089cd54.tar.bz2
drakx-17f7498cb36b2b155f4e005b2ab1be1aa089cd54.tar.xz
drakx-17f7498cb36b2b155f4e005b2ab1be1aa089cd54.zip
- diskdrake
o fix 1.9TB displayed as 1TB
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/common.pm12
-rw-r--r--perl-install/install/NEWS2
3 files changed, 11 insertions, 5 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8fa8f8636..3c0404619 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake
+ o fix 1.9TB displayed as 1TB
- drakboot -boot
o update splash when changing framebuffer resolution (#27470)
diff --git a/perl-install/common.pm b/perl-install/common.pm
index d297225af..0f2154244 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -128,15 +128,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 8ff21468e..4be5aef7c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake
+ o fix 1.9TB displayed as 1TB
- do not ask for updates at end of installation when updates are already
available (network installs) (#30344)
- do not try to configure dvd devices since /dev is wiped out at