diff options
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakautoinst | 18 | ||||
| -rw-r--r-- | perl-install/standalone/drakhelp | 2 | ||||
| -rwxr-xr-x | perl-install/standalone/drakperm | 5 |
4 files changed, 14 insertions, 13 deletions
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 8b51d24e4..ca138095f 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -277,7 +277,7 @@ sub unselectPackage($$;$) { my $state = $packages->{state} ||= {}; 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)); + log::l(" removed selection on package " . $pkg->fullname . "gives " . join(',', map { scalar $_->fullname } @l)); if ($o_otherOnly) { foreach (@l) { $o_otherOnly->{$_->id} = undef; diff --git a/perl-install/standalone/drakautoinst b/perl-install/standalone/drakautoinst index f181d1e97..25eca63c2 100755 --- a/perl-install/standalone/drakautoinst +++ b/perl-install/standalone/drakautoinst @@ -118,7 +118,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { wacom => '', ); - member($_, keys %struct_gui) and push @{$tree{$struct_gui{$_}}}, [ $_ , $pixmap{$_}, h2widget($o->{$_}, "\$o->\{$_\}") ] foreach keys %$o; + member($_, keys %struct_gui) and push @{$tree{$struct_gui{$_}}}, [ $_ , $pixmap{$_}, h2widget($o->{$_}, "\$o->\{$_}") ] foreach keys %$o; my $W = ugtk2->new('$o edition'); my @box_to_hide; @@ -167,7 +167,7 @@ if (!$::isEmbedded && $in->isa('interactive::gtk')) { my $local_page = $nb_pages; my $function = sub { $notebook->set_page($local_page) }; gtksignal_connect($button, toggled => sub { - $button->get_active() and $function->() + $button->get_active and $function->() }); my $b; if ($_->[1] ne "") { $b = gtkcreate_img($_->[1]) } else { $b = () }; @@ -258,7 +258,7 @@ sub h2widget { $widget_list[$i] = create_packtable({ col_spacings => 10, row_spacings => 3 }, map { my $e; - $e = h2widget($k->{$_}, "$label\{$_\}"); + $e = h2widget($k->{$_}, "$label\{$_}"); [ "$_ : ", $e ] } @list_keys ), ) @@ -270,7 +270,7 @@ sub h2widget { $field eq '' and return undef; gtkpack__($vb, $widget_list[$i] = create_packtable({ col_spacings => 10, row_spacings => 3 }, - [ "$field : ", h2widget($ref_local_k, "$label\{$field\}") ]) + [ "$field : ", h2widget($ref_local_k, "$label\{$field}") ]) ); @$widget_list2 = @widget_list; }, @@ -278,7 +278,7 @@ sub h2widget { ); } else { $w = create_packtable({ col_spacings => 10, row_spacings => 3 }, - map { create_entry_element($k->{$_}, "$label\{$_\}", $_) } @list_keys + map { create_entry_element($k->{$_}, "$label\{$_}", $_) } @list_keys ) } } elsif (ref($k) =~ /ARRAY/) { @@ -288,13 +288,13 @@ sub h2widget { $w = gtkpack_(new Gtk2::VBox(0,0), 1, create_scrolled_window( gtkpack__($vb = new Gtk2::VBox(0,5), - map { $i++; $widget_list[$i] = h2widget($_, "$label\[$i\]") } @$k, + map { $i++; $widget_list[$i] = h2widget($_, "$label\[$i]") } @$k, ) ), control_buttons($k->[0], sub { my ($vb, $widget_list2, $ref_local_k, $i) = @_; my @widget_list = @$widget_list2; - gtkpack__($vb, $widget_list[$i] = h2widget($ref_local_k, "$label\[$i\]")); + gtkpack__($vb, $widget_list[$i] = h2widget($ref_local_k, "$label\[$i]")); @$widget_list2 = @widget_list; }, $vb, \$i, \@widget_list) @@ -311,9 +311,9 @@ sub create_entry_element { my ($text, $value, $label) = @_; my $e; if (ref $text =~ /HASH/) { - return ([ "$label : ", h2widget($text, $label) ]); + return [ "$label : ", h2widget($text, $label) ]; } elsif (ref $text =~ /ARRAY/) { - return ([ "$label : ", h2widget($text, $label) ]); + return [ "$label : ", h2widget($text, $label) ]; } else { $e = new Gtk2::Entry; $e->{value} = $value; diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index d4e9d264d..4b94aefb4 100644 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -16,7 +16,7 @@ die "Usage: drakhelp <help_path>" if @ARGV != 1; my $in = interactive->vnew; my $locale = lang::read('', $>); -printf("lang is %s\n",$locale->{lang}); +printf("lang is %s\n", $locale->{lang}); $locale->{lang} = 'en' unless member($locale->{lang}, qw(en es fr)); my $path2help = "/usr/share/doc/mandrake/" . $locale->{lang} . "/"; my $path = $ARGV[0] =~ /^http|^www/ ? $ARGV[0] : $path2help . $ARGV[0]; diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 0347cc9ce..aa7c3e28b 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -16,7 +16,8 @@ local $_ = join '', @ARGV; my ($default_perm_level) = "level ".chomp_(`cat /etc/sysconfig/msec | grep SECURE_LEVEL= |cut -d= -f2`); my $perm_path = '/usr/share/msec/'; my $local_path = '/etc/security/msec/'; -my %perm = ( 'level 1' => $perm_path.'perm.1', +my %perm = ( + 'level 1' => $perm_path.'perm.1', 'level 2' => $perm_path.'perm.2', 'level 3' => $perm_path.'perm.3', 'level 4' => $perm_path.'perm.4', @@ -367,7 +368,7 @@ sub row_setting_dialog { $vbox; } keys %rights), gtkpack(Gtk2::VBox->new(0,5), - Gtk2::Label->new (' '), + Gtk2::Label->new(' '), $suid, $gid, $sticky, |