perl_checker compliance

10 files changed, 27 insertions, 27 deletions

diff --git a/perl-install/any.pm b/perl-install/any.pm
index f723435f0..349606f4c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -665,7 +665,7 @@ when your installation is complete and you restart your system.")),
 	$in->ask_from_($common,
 	[ { val => \$lang, separator => '|', 
 	    if_($using_images, image2f => sub { $name2l{$_[0]} =~ /^[a-z]/ ? ('', "langs/lang-$name2l{$_[0]}") : $_[0] }),
-	    format => sub { $_[0] =~ /(.*\|)(.*)/ ? $1.lang::l2name($2) : lang::l2name($_[0]) },
+	    format => sub { $_[0] =~ /(.*\|)(.*)/ ? $1 . lang::l2name($2) : lang::l2name($_[0]) },
 	    list => \@langs, sort => 0 },
 	    if_($o_langs_ && !$::move,
                 { val => \$in->{locale}{utf8}, type => 'bool', text => N("Use Unicode by default"), advanced => 1 },
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index df5f02ba2..c7805f761 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -430,7 +430,7 @@ sub setPackages {
 			useMedium($prev_asked_medium);
 			last SUPPL;
 		    }
-		    my $tmphdlistfile = pkgs::urpmidir($o->{prefix})."/hdlist$medium_name.cz";
+		    my $tmphdlistfile = pkgs::urpmidir($o->{prefix}) . "/hdlist$medium_name.cz";
 		    open(my $f2, ">", $tmphdlistfile);
 		    local $_;
 		    while (<$f>) { syswrite($f2, $_) }
@@ -712,7 +712,7 @@ sub install_urpmi {
 	$packages->import_needed_pubkeys($medium->{pubkey}, db => $db, callback => sub {
 					     my (undef, undef, $_k, $id, $imported) = @_;
 					     if ($id) {
-						 log::l(($imported ? "imported" : "found")." key=$id for medium $medium->{descr}");
+						 log::l(($imported ? "imported" : "found") . " key=$id for medium $medium->{descr}");
 						 $medium->{key_ids}{$id} = undef;
 					     }
 					 });
@@ -747,7 +747,7 @@ sub install_urpmi {
 			my $arch = $_->arch;
 			my $ldir = $dir;
 			$ldir =~ s|/([^/]*)%{ARCH}|/./$1$arch|; $ldir =~ s|%{ARCH}|$arch|g;
-			print $LIST "$ldir/".$_->filename."\n";
+			print $LIST "$ldir/" . $_->filename . "\n";
 		    }
 		} else {
 		    #- need to use another method here to build list file.
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f0d540d7e..f1539b655 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -395,7 +395,7 @@ sub beforeInstallPackages {
 
 sub pkg_install {
     my ($o, @l) = @_;
-    log::l("selecting packages ".join(" ", @l));
+    log::l("selecting packages " . join(" ", @l));
     require pkgs;
     if ($::testing) {
 	log::l(qq(selecting package "$_")) foreach @l;
diff --git a/perl-install/interactive/stdio.pm b/perl-install/interactive/stdio.pm
index ba3088876..8fd7a43ef 100644
--- a/perl-install/interactive/stdio.pm
+++ b/perl-install/interactive/stdio.pm
@@ -155,7 +155,7 @@ Your choice? ");
     }
     my ($callback_error) = $common->{callbacks}{$i == 2 ? 'canceled' : 'complete'}->();
     $callback_error and goto ask_fromW_begin;
-    return !($i == 2);
+    return $i != 2;
 }
 
 sub wait_messageW {
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index d4861bf42..a2281cdb9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -148,7 +148,7 @@ sub l2language       { exists $langs{$_[0]} && $langs{$_[0]}[5] }
 sub list_langs {
     my (%options) = @_;
     my @l = keys %langs;
-    $options{exclude_non_installed} ? grep { -e "/usr/share/locale/".l2locale($_)."/LC_CTYPE" } @l : @l;
+    $options{exclude_non_installed} ? grep { -e "/usr/share/locale/" . l2locale($_) . "/LC_CTYPE" } @l : @l;
 }
 
 sub text_direction_rtl() { N("default:LTR") eq "default:RTL" }
@@ -411,7 +411,7 @@ sub c2locale { exists $countries{$_[0]} && $countries{$_[0]}[1] }
 sub list_countries {
     my (%options) = @_;
     my @l = keys %countries;
-    $options{exclude_non_installed} ? grep { -e "/usr/share/locale/".c2locale($_)."/LC_CTYPE" } @l : @l;
+    $options{exclude_non_installed} ? grep { -e "/usr/share/locale/" . c2locale($_) . "/LC_CTYPE" } @l : @l;
 }
 
 #- this list is built with the following command on the compile cluster:
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index d880912a0..25cdd9237 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -304,7 +304,7 @@ sub unselectPackage($$;$) {
     $pkg->flag_selected or return;
 
     my $state = $packages->{state} ||= {};
-    log::l("removing selection on package ".$pkg->fullname);
+    log::l("removing selection on package " . $pkg->fullname);
     my @l = $packages->disable_selected($packages->{rpmdb}, $state, $pkg);
     log::l("   removed selection on package " . $pkg->fullname . "gives " . join(',', map { scalar $_->fullname } @l));
     if ($o_otherOnly) {
@@ -330,7 +330,7 @@ sub unselectAllPackages($) {
 	if ($_->flag_base || $_->flag_installed && $_->flag_selected) {
 	    #- keep track of package that should be kept selected.
 	    $keep_selected{$_->id} = $_;
-	    log::l("...keeping ".$_->fullname);
+	    log::l("...keeping " . $_->fullname);
 	} else {
 	    #- deselect all packages except base or packages that need to be upgraded.
 	    $_->set_flag_required(0);
@@ -557,7 +557,7 @@ sub read_rpmsrate {
 			    log::l("can't handle complicate flags for packages appearing twice ($_)");
 			    $fatal_error++;
 			}
-			log::l("package $_ appearing twice with different rates ($rate != ".$p->rate.")") if $rate != $p->rate;
+			log::l("package $_ appearing twice with different rates ($rate != " . $p->rate . ")") if $rate != $p->rate;
 			$p->set_rate($rate);
 			$p->set_rflags("$m3[0]||$m4[0]");
 		    } else {
@@ -1094,7 +1094,7 @@ sub install($$$;$$) {
 		    if ($retry_pkg) {
 			log::l("opened rpm database for retry transaction of 1 package only");
 			$trans->add($retry_pkg, $isUpgrade && allowedToUpgrade($retry_pkg->name))
-			    or log::l("add failed for ".$retry_pkg->fullname);
+			    or log::l("add failed for " . $retry_pkg->fullname);
 		    } else {
 			log::l("opened rpm database for transaction of " . int(@transToInstall) .
 			       " new packages, still $nb after that to do");
@@ -1102,7 +1102,7 @@ sub install($$$;$$) {
 			  foreach @transToInstall;
 		    }
 
-		    my @checks = $trans->check; @checks and log::l("check failed : ".join("\n               ", @checks));
+		    my @checks = $trans->check; @checks and log::l("check failed : " . join("\n               ", @checks));
 		    $trans->order or die "error ordering package list: " . c::rpmErrorString();
 		    $trans->set_script_fd(fileno $LOG);
 
@@ -1172,7 +1172,7 @@ sub install($$$;$$) {
 		foreach (@transToInstall) {
 		    if (!$_->flag_installed && packageMedium($packages, $_)->{selected} && !exists($ignoreBadPkg{$_->name})) {
 			push @badPackages, $_;
-			log::l("bad package ".$_->fullname);
+			log::l("bad package " . $_->fullname);
 		    } else {
 			$_->free_header;
 		    }
@@ -1185,7 +1185,7 @@ sub install($$$;$$) {
 		my $name;
 		if (!$retry_pkg->flag_installed && packageMedium($packages, $retry_pkg)->{selected} && !exists($ignoreBadPkg{$retry_pkg->name})) {
 		    if ($retry_count) {
-			log::l("retrying installing package ".$retry_pkg->fullname." alone in a transaction");
+			log::l("retrying installing package " . $retry_pkg->fullname . " alone in a transaction");
 			--$retry_count;
 		    } else {
 			log::l("bad package " . $retry_pkg->fullname . " unable to be installed");
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm
index fc3f82f24..0a24c4cf5 100644
--- a/perl-install/standalone.pm
+++ b/perl-install/standalone.pm
@@ -172,14 +172,14 @@ $SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --inci
 
 sub import {
     ($standalone_name = $0) =~ s|.*/||;
-    c::openlog($standalone_name."[$$]");
+    c::openlog($standalone_name . "[$$]");
     explanations('### Program is starting ###');
 
     eval "*common::$_ = *$_" foreach @common_functs;
 
     foreach my $f (@builtin_functs) {
-	eval "*$_"."::$f = *$f" foreach @drakx_modules;
-	eval "*".caller()."::$f = *$f";
+	eval "*$_" . "::$f = *$f" foreach @drakx_modules;
+	eval "*" . caller() . "::$f = *$f";
     }
 }
 
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index c8f725b8d..b33f445f3 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -169,7 +169,7 @@ my %menu_options = (
 my @menu_items = 
     (
      [ N("/_File"), undef, undef, undef, '<Branch>' ],
-     [ N("/_File").N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ],
+     [ N("/_File") . N("/_Quit"), N("<control>Q"), \&quit_global, undef, '<StockItem>', 'gtk-quit' ],
      [ join('', @{$menu_options{PRINTERS_DETECTION}}), undef, 
        sub { $options{PRINTERS_DETECTION} = $check_boxes{PRINTERS_DETECTION}->get_active }, undef, '<CheckItem>' ],
      [ join('', @{$menu_options{MODEMS_DETECTION}}), undef,
@@ -177,8 +177,8 @@ my @menu_items =
      [ join('', @{$menu_options{JAZZ_DETECTION}}), undef,
        sub { $options{JAZZ_DETECTION} = $check_boxes{JAZZ_DETECTION}->get_active }, undef, '<CheckItem>' ],
      [ $menus{help}, undef, undef, undef, '<Branch>' ],
-     [ $menus{help}.N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ],
-     [ $menus{help}.N("/_Fields description"), undef, sub {
+     [ $menus{help} . N("/_Help"), undef, sub { unless (fork()) { exec("drakhelp --id harddrake") } }, undef, '<Item>' ],
+     [ $menus{help} . N("/_Fields description"), undef, sub {
            if ($current_device) {
                create_dialog(N("Harddrake help"), 
                              N("Description of the fields:\n\n")
@@ -194,8 +194,8 @@ my @menu_items =
        },
        undef, '<Item>'
      ],
-     [ $menus{help}.N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ],
-     [ $menus{help}.N("/_About..."), undef, sub {
+     [ $menus{help} . N("/_Report Bug"), undef, sub { unless (fork()) { exec("drakbug --report harddrake2 &") } }, undef, '<Item>' ],
+     [ $menus{help} . N("/_About..."), undef, sub {
            create_dialog(N("About Harddrake"), 
 #-PO: Do not alter the <span ..> and </span> tags
                          N("This is HardDrake, a Mandrakelinux hardware configuration tool.\n<span foreground=\"royalblue3\">Version:</span> %s
@@ -422,7 +422,7 @@ foreach (@classes) {
 
         my $custom_id = harddrake::data::custom_id($_, $title);
         foreach my $field (qw(devfs_device device)) {
-            $_->{$field} = '/dev/'.$_->{$field} if $_->{$field};
+            $_->{$field} = "/dev/$_->{$field}" if $_->{$field};
         }
         $tree_model->append_set($parent_iter, [ 1 => $custom_id, 2 => $index++ ]);
         push @data, [ $_, $Ident ];
diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake
index 1cb00f405..586622f9a 100755
--- a/perl-install/standalone/service_harddrake
+++ b/perl-install/standalone/service_harddrake
@@ -16,7 +16,7 @@ use Storable qw(store retrieve);
 
 my $invert_do_it = $ARGV[0] eq 'X11' ? 1 : 0;
 my ($hw_sysconfdir, $timeout) = ("/etc/sysconfig/harddrake2", $invert_do_it ? 600 : 25);
-my $last_boot_config = $hw_sysconfdir."/previous_hw";
+my $last_boot_config = "$hw_sysconfdir/previous_hw";
 
 $last_boot_config .= '_X11' if $invert_do_it;
 
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 0fa3e60d9..7e6468778 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -236,7 +236,7 @@ sub gtkpowerpack {
 	}
 	#- Get and pack the widget (create it if necessary to  a label...)
 	my $widget = ref($_[0]) ? shift : Gtk2::WrappedLabel->new(shift);
-	my $pack_call = 'pack_'.($attr{pack_end} ? 'end' : 'start');
+	my $pack_call = 'pack_' . ($attr{pack_end} ? 'end' : 'start');
 	$box->$pack_call($widget, $attr{expand}, $attr{fill}, $attr{padding});
 	$widget->show;
     }
@@ -1181,7 +1181,7 @@ sub _ask_dir {
     $f->selection_entry->get_parent->hide;
     $f->ok_button->signal_connect(clicked => sub {
 				      my ($model, $iter) = $f->dir_list->get_selection->get_selected;
-				      $o->{retval} .= '/'.$model->get($iter, 0) if $model;
+				      $o->{retval} .= '/' . $model->get($iter, 0) if $model;
 				  });
 }