no_comment

4 files changed, 12 insertions, 6 deletions

diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 151353989..16c8a6b0c 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -224,8 +224,8 @@ sub verifyParts_ {
 	foreach (@_) {
 	    next if !$i || !$_ || $i == $_ || isWholedisk($i); #- avoid testing twice on whole disk for simplicity :-)
 	    isWholedisk($_) ?
-		verifyInside($i, $_) || cdie sprintf "partitions sector #$i->{start} (%dMB) is not inside whole disk (%dMB)!", $i->{size} >> 9, $_->{size} >> 9:
-		verifyNotOverlap($i, $_) || cdie sprintf "partitions sector #$i->{start} (%dMB) and sector #$_->{start} (%dMB) are overlapping!", $i->{size} >> 9, $_->{size} >> 9;
+		verifyInside($i, $_) || cdie sprintf "partitions sector #$i->{start} (%dMB) is not inside whole disk (%dMB)!", $i->{size} >> 11, $_->{size} >> 11:
+		verifyNotOverlap($i, $_) || cdie sprintf "partitions sector #$i->{start} (%dMB) and sector #$_->{start} (%dMB) are overlapping!", $i->{size} >> 11, $_->{size} >> 11;
 	}
     }
 }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index ae4df8cee..6870905f5 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -15,7 +15,7 @@ use c;
 #- lower bound on the left ( aka 90 means [90-100[ )
 my %compssList = (
   90 => __("must have"), #- every install have these packages (unless hand de-selected in expert, or not enough room)
-  80 => __("important"), #- every custom install have these packages (unless not enough space)
+  80 => __("important"), #- every beginner/custom install have these packages (unless not enough space)
 		         #- has minimum X install (XFree86 + icewm)(normal)
   70 => __("very nice"), #- KDE(normal)
   60 => __("nice"),      #- gnome(normal)
@@ -25,7 +25,13 @@ my %compssList = (
   20 => __("maybe"),
   10 => __("useless"),
    0 => __("garbage"),
+#- if the package requires locales-LANG and LANG is chosen, rating += 90
+ -10 => __("i18n (important)"), #- every install in the corresponding lang have these packages
+ -20 => __("i18n (very nice)"), #- every beginner/custom install in the corresponding lang have theses packages
+ -30 => __("i18n (nice)"),
 );
+#- HACK: rating += 10 if the group is selected and it is not a kde package (aka name !~ /^k/)
+
 
 my @skip_list = qw(
 XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mono
diff --git a/perl-install/resize_fat/main.pm b/perl-install/resize_fat/main.pm
index bac7f8ad1..c2e589e74 100644
--- a/perl-install/resize_fat/main.pm
+++ b/perl-install/resize_fat/main.pm
@@ -130,7 +130,7 @@ sub resize {
     $size >= $min or die "Minimum filesystem size is $min sectors";
     $size <= $max or die "Maximum filesystem size is $max sectors";
 
-    log::l("resize_fat: Partition size will be ", $size * $SECTORSIZE >> 20, "Mb (well exactly ${size} sectors)");
+    log::l("resize_fat: Partition size will be ", $size >> 11, "Mb (well exactly ${size} sectors)");
 
     my $new_data_size = $size * $SECTORSIZE - $fs->{cluster_offset};
     my $new_nb_clusters = divide($new_data_size, $fs->{cluster_size});
diff --git a/perl-install/swap.pm b/perl-install/swap.pm
index a7f122bec..17033f39f 100644
--- a/perl-install/swap.pm
+++ b/perl-install/swap.pm
@@ -74,7 +74,7 @@ sub make($;$) {
 	$version = 1;
     }
 
-    $nbpages >= 10 or die "swap area needs to be at least " . (10 * $pagesize >> 10) . "kB";
+    $nbpages >= 10 or die "swap area needs to be at least " . (10 * $pagesize / 1024) . "kB";
 
     -b $devicename or $checkBlocks = 0;
     my $rdev = (stat $devicename)[6];# or log::l("stat of $devicename failed: $!");
@@ -88,7 +88,7 @@ sub make($;$) {
 
     if ($nbpages > $maxpages) {
 	$nbpages = $maxpages;
-	log::l("warning: truncating swap area to " . ($nbpages * $pagesize >> 10) . "kB");
+	log::l("warning: truncating swap area to " . ($nbpages * $pagesize / 1024) . "kB");
     }
 
     if ($checkBlocks) {