summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-05 13:45:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-05 13:45:42 +0000
commiteb709bbd83e5979dda24e401fb51a83f14412f39 (patch)
tree83c32db4c8d6f4afc3aa28ef8d895ca869e279e6
parentcdef0fd204617c22ce6daa871284f3b454afd7da (diff)
downloaddrakx-backup-do-not-use-eb709bbd83e5979dda24e401fb51a83f14412f39.tar
drakx-backup-do-not-use-eb709bbd83e5979dda24e401fb51a83f14412f39.tar.gz
drakx-backup-do-not-use-eb709bbd83e5979dda24e401fb51a83f14412f39.tar.bz2
drakx-backup-do-not-use-eb709bbd83e5979dda24e401fb51a83f14412f39.tar.xz
drakx-backup-do-not-use-eb709bbd83e5979dda24e401fb51a83f14412f39.zip
perl_checker fixes
-rw-r--r--perl-install/.perl_checker4
-rw-r--r--perl-install/bootloader.pm1
-rw-r--r--perl-install/interactive/http.pm1
-rw-r--r--perl-install/network/shorewall.pm2
-rw-r--r--perl-install/partition_table/mac.pm1
-rw-r--r--perl-install/partition_table/raw.pm2
-rw-r--r--perl-install/partition_table/sun.pm1
-rw-r--r--perl-install/resize_fat/dir_entry.pm2
-rw-r--r--perl-install/wizards.pm2
9 files changed, 7 insertions, 9 deletions
diff --git a/perl-install/.perl_checker b/perl-install/.perl_checker
index 787ccabad..2958904cd 100644
--- a/perl-install/.perl_checker
+++ b/perl-install/.perl_checker
@@ -8,4 +8,6 @@ printer::hpoj
printer::main
printer::printerdrake
standalone
-urpm \ No newline at end of file
+urpm
+scanner
+move
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index aee385ea1..c6d3b935e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1082,7 +1082,6 @@ sub write_grub_config {
output "$::prefix/boot/grub/device.map",
join '', map { "($_) /dev/$bios2dev{$_}\n" } sort keys %bios2dev;
}
- my $bootIsReiser = isThisFs("reiserfs", fsedit::get_root($fstab, 'boot'));
my $file2grub = sub {
my ($part, $file) = fsedit::file2part($fstab, $_[0], 'keep_simple_symlinks');
dev2grub($part->{device}, \%dev2bios) . $file;
diff --git a/perl-install/interactive/http.pm b/perl-install/interactive/http.pm
index ea2ae1311..393ede7f6 100644
--- a/perl-install/interactive/http.pm
+++ b/perl-install/interactive/http.pm
@@ -13,7 +13,6 @@ use log;
my $script_name = $ENV{INTERACTIVE_HTTP};
my $no_header;
-my $uid;
my $pipe_r = "/tmp/interactive_http_r";
my $pipe_w = "/tmp/interactive_http_w";
diff --git a/perl-install/network/shorewall.pm b/perl-install/network/shorewall.pm
index bd069f063..58242eb7f 100644
--- a/perl-install/network/shorewall.pm
+++ b/perl-install/network/shorewall.pm
@@ -94,7 +94,7 @@ sub read {
$conf{masquerade}{subnet} = $e->[1] if $e->[1];
}
if ($mode eq 'silent') {
- put_in_hash(\%conf, default_interfaces_silent($in));
+ put_in_hash(\%conf, default_interfaces_silent($in), @l . 2);
} else {
put_in_hash(\%conf, default_interfaces($in));
};
diff --git a/perl-install/partition_table/mac.pm b/perl-install/partition_table/mac.pm
index 004baffbe..26a7bc7a5 100644
--- a/perl-install/partition_table/mac.pm
+++ b/perl-install/partition_table/mac.pm
@@ -25,7 +25,6 @@ my %typeToDos = (
"Apple_UNIX_SVR2" => 0x483,
"Apple_Free" => 0x0,
);
-my %typeFromDos = reverse %typeToDos;
my ($bz_format, $bz_fields) = list2kv(
diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm
index acbec0458..5713e69d6 100644
--- a/perl-install/partition_table/raw.pm
+++ b/perl-install/partition_table/raw.pm
@@ -110,7 +110,7 @@ sub get_geometry($) {
sub openit {
my ($hd, $o_mode) = @_;
- my $F; sysopen($F, $hd->{file}, $o_mode || 0) and $F;
+ my $F; sysopen($F, $hd->{file}, $o_mode || 0) && $F;
}
# cause kernel to re-read partition table
diff --git a/perl-install/partition_table/sun.pm b/perl-install/partition_table/sun.pm
index b92724e1f..951a4b471 100644
--- a/perl-install/partition_table/sun.pm
+++ b/perl-install/partition_table/sun.pm
@@ -34,7 +34,6 @@ $main_format = join '', @$main_format;
my ($fields1, $fields2) = ([ qw(type flags) ], [ qw(start_cylinder size) ]);
my ($format1, $format2) = ("xCxC", "N2");
-my ($size1, $size2) = map { psizeof($_) } ($format1, $format2);
my $magic = 0xDABE;
my $nb_primary = 8;
my $offset = 0;
diff --git a/perl-install/resize_fat/dir_entry.pm b/perl-install/resize_fat/dir_entry.pm
index 9b990be2e..130bac7c8 100644
--- a/perl-install/resize_fat/dir_entry.pm
+++ b/perl-install/resize_fat/dir_entry.pm
@@ -6,7 +6,7 @@ use strict;
my $DELETED_FLAG = 0xe5;
-my $READ_ONLY_ATTR = 0x01;
+my $_READ_ONLY_ATTR = 0x01;
my $HIDDEN_ATTR = 0x02;
my $SYSTEM_ATTR = 0x04;
my $VOLUME_LABEL_ATTR = 0x08;
diff --git a/perl-install/wizards.pm b/perl-install/wizards.pm
index e7fe2be03..3a5c99ce1 100644
--- a/perl-install/wizards.pm
+++ b/perl-install/wizards.pm
@@ -108,7 +108,7 @@ my %default_callback = (changed => sub {}, focus_out => sub {}, complete => sub
sub process {
- my ($w, $o, $in) = @_;
+ my ($_w, $o, $in) = @_;
local $::isWizard = 1;
local $::Wizard_title = $o->{name} || $::Wizard_title;
local $::Wizard_pix_up = $o->{defaultimage} || $::Wizard_pix_up;