From 4853428679b16e13068729ef2fe091ac74ec2f3e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 8 Jan 2004 16:36:30 +0000
Subject: perl_checker compliance

---
 perl-install/Xconfig/resolution_and_depth.pm | 4 ++--
 perl-install/diskdrake/interactive.pm        | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/perl-install/Xconfig/resolution_and_depth.pm b/perl-install/Xconfig/resolution_and_depth.pm
index 8c095a64b..7c115bd63 100644
--- a/perl-install/Xconfig/resolution_and_depth.pm
+++ b/perl-install/Xconfig/resolution_and_depth.pm
@@ -143,8 +143,8 @@ sub choose {
 		     val => \$resolution, type => 'list', sort => 0,
 		     list => [ sort { $a->{X} <=> $b->{X} } @resolutions ],
 		     format => sub { "$_[0]{X}x$_[0]{Y} $_[0]{Depth}bpp" },
-		    } ])
-      and $resolution;
+		    } ]) or return;
+    $resolution;
 }
 
 
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 68cfeaee8..67c9cb721 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1110,7 +1110,9 @@ sub warn_if_renumbered {
     my $l = delete $hd->{partitionsRenumbered};
     return if is_empty_array_ref($l);
 
-    my @l = map { N("partition %s is now known as %s", @$_) } @$l;
+    my @l = map { 
+	my ($old, $new) = @$_;
+	N("partition %s is now known as %s", $old, $new) } @$l;
     $in->ask_warn('', join("\n", 'Partitions have been renumbered: ', @l));
 }
 
@@ -1193,7 +1195,7 @@ sub format_hd_info {
     $info .= N("Device: ") . "$hd->{device}\n";
     $info .= N("Read-only") . "\n" if $hd->{readonly};
     $info .= N("Size: %s\n", formatXiB($hd->{totalsectors}, 512)) if $hd->{totalsectors};
-    $info .= N("Geometry: %s cylinders, %s heads, %s sectors\n", @{$hd->{geom}}{qw(cylinders heads sectors)}) if $::expert && $hd->{geom};
+    $info .= N("Geometry: %s cylinders, %s heads, %s sectors\n", $hd->{geom}{cylinders}, $hd->{geom}{heads}, $hd->{geom}{sectors}) if $::expert && $hd->{geom};
     $info .= N("Info: ") . ($hd->{info} || $hd->{media_type}) . "\n" if $::expert && ($hd->{info} || $hd->{media_type});
     $info .= N("LVM-disks %s\n", join ", ", map { $_->{device} } @{$hd->{disks}}) if isLVM($hd) && $hd->{disks};
     $info .= N("Partition table type: %s\n", $1) if $::expert && ref($hd) =~ /_([^_]+)$/;
-- 
cgit v1.2.1