diff options
| -rw-r--r-- | perl-install/install_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rwxr-xr-x | perl-install/scanner.pm | 4 | ||||
| -rw-r--r-- | perl-install/security/l10n.pm | 2 | ||||
| -rw-r--r-- | perl-install/security/msec.pm | 2 | ||||
| -rw-r--r-- | perl-install/services.pm | 1 | ||||
| -rw-r--r-- | perl-install/ugtk2.pm | 4 |
7 files changed, 9 insertions, 10 deletions
diff --git a/perl-install/install_gtk.pm b/perl-install/install_gtk.pm index e44868e37..61c3c5614 100644 --- a/perl-install/install_gtk.pm +++ b/perl-install/install_gtk.pm @@ -199,7 +199,7 @@ sub create_logo_window { #------------------------------------------------------------------------------ sub init_gtk() { symlink("/tmp/stage2/etc/$_", "/etc/$_") foreach qw(gtk-2.0 pango fonts); - Gtk2->init(); + Gtk2->init; Gtk2->set_locale; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 6c7ba0e49..ebf60d96f 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1136,9 +1136,9 @@ sub setRootPassword { focus_first => 1, callbacks => { complete => sub { - $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return (1,0); + $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ N("The passwords do not match"), N("Please try again") ]), return 1,0; length $sup->{password} < 2 * $o->{security} - and $o->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return (1,0); + and $o->ask_warn('', N("This password is too short (it must be at least %d characters long)", 2 * $o->{security})), return 1,0; return 0 } } }, [ { label => N("Password"), val => \$sup->{password}, hidden => 1 }, diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index e1267c600..13d867bff 100755 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -246,7 +246,7 @@ sub get_usb_ids_for_port { while (my $line = <DETECT>) { if ($line =~ /ID\s+([0-9a-f]+):(0x[0-9a-f]+)($|\s+)/) { # Scanner connected via scanner.o kernel module - return ("0x$1", "0x$2"); + return "0x$1", "0x$2"; last; } } @@ -257,7 +257,7 @@ sub get_usb_ids_for_port { if ($line =~ /^\s*found\s+USB\s+scanner/i) { if ($line =~ /vendor=(0x[0-9a-f]+)[^0-9a-f]+.*prod(|uct)=(0x[0-9a-f]+)[^0-9a-f]+/) { # Scanner connected via scanner.o kernel module - return ($1, $3); + return $1, $3; } } } diff --git a/perl-install/security/l10n.pm b/perl-install/security/l10n.pm index 71d0e2b71..64d0c2520 100644 --- a/perl-install/security/l10n.pm +++ b/perl-install/security/l10n.pm @@ -6,7 +6,7 @@ package security::l10n; use common; -sub fields { +sub fields() { return ( 'accept_bogus_error_responses' => N("Accept bogus IPv4 error messages"), 'accept_broadcasted_icmp_echo' => N("Accept broadcasted icmp echo"), diff --git a/perl-install/security/msec.pm b/perl-install/security/msec.pm index 4870d75b6..706daf5b7 100644 --- a/perl-install/security/msec.pm +++ b/perl-install/security/msec.pm @@ -127,7 +127,7 @@ sub set_check { sub apply_functions { my ($msec) = @_; - my @list = sort ($msec->list_functions('system'), $msec->list_functions('network')); + my @list = sort($msec->list_functions('system'), $msec->list_functions('network')); substInFile { foreach my $function (@list) { s/^$function.*\n// } if (eof) { diff --git a/perl-install/services.pm b/perl-install/services.pm index 663a2b4a2..79a7f233d 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -206,7 +206,6 @@ sub ask_standalone_gtk { my $update_service = sub { my ($service, $label) = @_; my $started = -e "/var/lock/subsys/$service"; - my $action = $started ? "stop" : "start"; $label->set_label($started ? N("running") : N("stopped")); }; my $b = Gtk2::EventBox->new; diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm index 3315fb191..abb463491 100644 --- a/perl-install/ugtk2.pm +++ b/perl-install/ugtk2.pm @@ -1363,11 +1363,11 @@ sub get_path_str { package Gtk2::TreeView; # likewise gtk-1.2 function sub toggle_expansion { - my ($self, $path, $open_all) = @_; + my ($self, $path, $b_open_all) = @_; if ($self->row_expanded($path)) { $self->collapse_row($path); } else { - $self->expand_row($path, $open_all || 0); + $self->expand_row($path, $b_open_all || 0); } } |