From d3c77792d4458c82943d4819e6080344151653a1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 2 Feb 2001 14:02:25 +0000
Subject: using the new formatXiB

---
 perl-install/Makefile               |  2 +-
 perl-install/partition_table.pm     | 12 ++++++------
 perl-install/partition_table_raw.pm |  4 ++--
 perl-install/pkgs.pm                |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/perl-install/Makefile b/perl-install/Makefile
index de0b977fc..4169902f6 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -153,4 +153,4 @@ full_stage2:
 
 stage2:
 	$(MAKE) install_pms
-	$(ROOTDEST)/misc/make_mdkinst_stage2 $(DEST) $(ROOTDEST)/Mandrake/base/mdkinst_stage2
+#	$(ROOTDEST)/misc/make_mdkinst_stage2 $(DEST) $(ROOTDEST)/Mandrake/base/mdkinst_stage2
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index e1f7573a5..bd10c2252 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -258,16 +258,16 @@ sub verifyParts_ {
 	    next if !$i || !$_ || $i == $_ || isWholedisk($i) || isExtended($i); #- avoid testing twice for simplicity :-)
 	    if (isWholedisk($_)) {
 		verifyInside($i, $_) or
-		  cdie sprintf("partition sector #$i->{start} (%dMB) is not inside whole disk (%dMB)!",
-			       $i->{size} >> 11, $_->{size} >> 11);
+		  cdie sprintf("partition sector #$i->{start} (%s) is not inside whole disk (%s)!",
+			       formatXiB($i->{size}, 512), formatXiB($_->{size}, 512));
 	    } elsif (isExtended($_)) {
 		verifyNotOverlap($i, $_) or
-		  log::l(sprintf("warning partition sector #$i->{start} (%dMB) is overlapping with extended partition!",
-				 $i->{size} >> 11)); #- only warning for this one is acceptable
+		  log::l(sprintf("warning partition sector #$i->{start} (%s) is overlapping with extended partition!",
+				 formatXiB($i->{size}, 512))); #- only warning for this one is acceptable
 	    } else {
 		verifyNotOverlap($i, $_) or
-		  cdie sprintf("partitions sector #$i->{start} (%dMB) and sector #$_->{start} (%dMB) are overlapping!",
-			       $i->{size} >> 11, $_->{size} >> 11);
+		  cdie sprintf("partitions sector #$i->{start} (%s) and sector #$_->{start} (%s) are overlapping!",
+			       formatXiB($i->{size}, 512), formatXiB($_->{size}, 512));
 	    }
 	}
     }
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index aca8a114a..edf0f0918 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -96,10 +96,10 @@ sub description {
     my ($hd) = @_;
     my $win = $hd->{device_windobe};
 
-    sprintf "%s%s (%d%s%s)", 
+    sprintf "%s%s (%s%s)", 
       $hd->{device}, 
       $win && " [$win:]", 
-      ($hd->{totalsectors} || $hd->{size}) >> 11, _("MB"), 
+      formatXiB($hd->{totalsectors} || $hd->{size}, 512),
       $hd->{info} && ", $hd->{info}";
 }
 
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index da18c0424..1227a21f8 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -704,7 +704,7 @@ sub setSelectedFromCompssList {
 	#- at this point the package can safely be selected.
 	selectPackage($packages, $p);
     }
-    log::l("setSelectedFromCompssList: reached size $nb, up to indice $min_level (less than $max_size)");
+    log::l("setSelectedFromCompssList: reached size %s, up to indice $min_level (less than %s)", formatXiB($nb), formatXiB($max_size));
     $min_level;
 }
 
-- 
cgit v1.2.1