summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-08-04 00:07:39 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-08-04 00:07:39 +0000
commit177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf (patch)
tree70316dc2fa1c5ab8800a231dec1eb9ddcc7a1f5c
parent43e776968595de9f499cbd75e65f7e67135e00f2 (diff)
downloaddrakx-177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf.tar
drakx-177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf.tar.gz
drakx-177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf.tar.bz2
drakx-177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf.tar.xz
drakx-177c0e4ae47de74d64e1aa194a6537fe6cf6e1bf.zip
perl_checker compliance
-rw-r--r--perl-install/ugtk2.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 7cb3d6ce0..8988220aa 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -1067,7 +1067,7 @@ sub ask_browse_tree_info {
0, my $box2 = Gtk2::HBox->new(0,10),
));
#gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new('horizontal', 'icons'));
- gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new());
+ gtkpack__($box2, my $toolbar = Gtk2::Toolbar->new);
my @l = ([ $common->{ok}, 1 ], if_($common->{cancel}, [ $common->{cancel}, 0 ]));
@l = reverse @l if !$::isInstall;
@@ -1460,9 +1460,9 @@ sub set {
package Gtk2::Entry;
sub new_with_text {
- shift;
+ my ($_class, @text) = @_;
my $entry = Gtk2::Entry->new;
- @_ and $entry->set_text(@_);
+ @text and $entry->set_text(@text);
return $entry;
}
>
#-TODO output "$workdir/ks.cfg", generate_ks_cfg($o);
output "$workdir/boot.msg", "\n7m",
"!! If you press enter, an auto-install is going to start.
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 372504570..a6bc82009 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -83,7 +83,7 @@ sub adsl_probe_info {
my %pppoe_conf; %pppoe_conf = getVarsFromSh($pppoe_file) if (! defined $adsl_type || $adsl_type =~ /pppoe/) && -f $pppoe_file;
my $login = $pppoe_conf{USER};
foreach (qw(/etc/ppp/peers/adsl /etc/ppp/options /etc/ppp/options.adsl)) {
- ($login) = map { if_(/^user\s+\"([^\"]+)\"/, $1) } cat_("$prefix/$_") if !$login && -r "$prefix/$_";
+ ($login) = map { if_(/^user\s+"([^"]+)"/, $1) } cat_("$prefix/$_") if !$login && -r "$prefix/$_";
}
($login) = map { if_(/\sname\s+([^ \n]+)/, $1) } cat_($pptp_file) if (! defined $adsl_type || $adsl_type =~ /pptp/) && -r $pptp_file;
my $passwd = passwd_by_login($login);
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 958690635..c1f433ec7 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -56,7 +56,7 @@ sub read_dhcpd_conf {
$file ||= "$::prefix/etc/dhcpd.conf";
{ option_routers => [ cat_($file) =~ /^\s*option routers\s+(\S+);/mg ],
subnet_mask => [ if_(cat_($file) =~ /^\s*option subnet-mask\s+(.*);/mg, split(' ', $1)) ],
- domain_name => [ if_(cat_($file) =~ /^\s*option domain-name\s+\"(.*)\";/mg, split(' ', $1)) ],
+ domain_name => [ if_(cat_($file) =~ /^\s*option domain-name\s+"(.*)";/mg, split(' ', $1)) ],
domain_name_servers => [ if_(cat_($file) =~ /^\s*option domain-name-servers\s+(.*);/m, split(' ', $1)) ],
dynamic_bootp => [ if_(cat_($file) =~ /^\s*range dynamic-bootp\s+\S+\.(\d+)\s+\S+\.(\d+)\s*;/m, split(' ', $1)) ],
default_lease_time => [ if_(cat_($file) =~ /^\s*default-lease-time\s+(.*);/m, split(' ', $1)) ],