From b5bc676d61e1e5f1f1840e8723f81dc24c344f98 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 29 Sep 2003 14:18:09 +0000
Subject: perl_checker fixes

---
 perl-install/.perl_checker           | 1 +
 perl-install/Xconfig/card.pm         | 2 +-
 perl-install/install_any.pm          | 4 ++--
 perl-install/network/drakfirewall.pm | 6 +++---
 perl-install/printer/detect.pm       | 3 +--
 perl-install/ugtk2.pm                | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/perl-install/.perl_checker b/perl-install/.perl_checker
index ae2c41a42..58f6715eb 100644
--- a/perl-install/.perl_checker
+++ b/perl-install/.perl_checker
@@ -4,3 +4,4 @@ printer::printerdrake
 urpm
 standalone
 handle_configs
+IO::Socket::INET
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index 3a5f9cd9b..f63787966 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -125,7 +125,7 @@ sub to_raw_X {
     $raw_X->{xfree4}->remove_load_module('v4l') if $card->{use_DRI_GLX} && $card->{Driver} eq 'r128';
 }
 
-sub default_ATI_fglrx_config { our $default_ATI_fglrx_config }
+sub default_ATI_fglrx_config() { our $default_ATI_fglrx_config }
 
 sub probe() {
 #-for Pixel tests
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 6032d5a31..e646d3930 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -504,7 +504,7 @@ sub install_urpmi {
     $packages->parse_pubkeys(db => $db);
     foreach my $medium (values %$mediums) {
 	$packages->import_needed_pubkeys($medium->{pubkey}, db => $db, callback => sub {
-					     my (undef, undef, $k, $id, $imported) = @_;
+					     my (undef, undef, $_k, $id, $imported) = @_;
 					     if ($id) {
 						 log::l(($imported ? "imported" : "found")." key=$id for medium $medium->{descr}");
 						 $medium->{key_ids}{$id} = undef;
@@ -586,7 +586,7 @@ sub install_urpmi {
   list: list.$name" : "") . (keys(%{$_->{key_ids}}) ? "
   key-ids: " . join(',', keys(%{$_->{key_ids}})) : "") . ($dir =~ /removable:/ && "
   removable: /dev/cdrom") . ($_->{update} ? "
-  update" : ""). "
+  update" : "") . "
 }
 
 ";
diff --git a/perl-install/network/drakfirewall.pm b/perl-install/network/drakfirewall.pm
index c5b8c6288..2c5bbd44d 100644
--- a/perl-install/network/drakfirewall.pm
+++ b/perl-install/network/drakfirewall.pm
@@ -106,13 +106,13 @@ sub default_from_pkgs {
 
 sub get_ports {
     my ($in, $_ports) = @_;
-    my $shorewall = network::shorewall::read($in,'silent') or return;
+    my $shorewall = network::shorewall::read($in, 'silent') or return;
     \$shorewall->{ports};
 }
 
 sub set_ports {
     my ($in, $disabled, $ports) = @_;
-    my $shorewall = network::shorewall::read($in,'not_silent') || network::shorewall::default_interfaces($in) or die \N("No network card");
+    my $shorewall = network::shorewall::read($in, 'not_silent') || network::shorewall::default_interfaces($in) or die \N("No network card");
     if (!$disabled || -x "$::prefix/sbin/shorewall") {
 	$in->do_pkgs->ensure_is_installed('shorewall', '/sbin/shorewall', $::isInstall) or return;
     
@@ -130,7 +130,7 @@ sub get_conf {
 
     if ($o_ports) {
 	$disabled, from_ports($o_ports);
-    } elsif (my $shorewall = network::shorewall::read($in,'silent')) {
+    } elsif (my $shorewall = network::shorewall::read($in, 'silent')) {
 	$shorewall->{disabled}, from_ports(\$shorewall->{ports});
     } else {
 	$in->ask_okcancel('', N("drakfirewall configurator
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index b61051d9b..8455fe06e 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -99,8 +99,7 @@ sub whatUsbport() {
 	    # it again
 	    my $itemfound = 0;
 	    # Extract the printer data from the ID string
-	    my ($manufacturer, $model, $serialnumber, $description, 
-		$commandset, $sku) =
+	    my ($manufacturer, $model, $serialnumber, $description, $commandset, $sku) =
 		    ("", "", "", "", "");
 	    if ($idstr =~ /MFG:([^;]+);/ || $idstr =~ /MANUFACTURER:([^;]+);/) {
 		$manufacturer = $1;
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index b47739413..c6fd1410d 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -807,7 +807,7 @@ sub new {
     $o->_create_window($title);
     while (my $e = shift @tempory::objects) { $e->destroy }
 
-    $o->{pop_it} ||= $pop_it || (!$::isWizard && !$::isEmbedded) || $::WizardTable && do {
+    $o->{pop_it} ||= $pop_it || !$::isWizard && !$::isEmbedded || $::WizardTable && do {
 	my @l = $::WizardTable->get_children;
 	pop @l if !$::isInstall && $::isWizard; #- don't take into account the DrawingArea
 	any { $_->visible } @l;
-- 
cgit v1.2.1