diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 12:46:32 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-12-04 12:46:32 +0000 |
| commit | 922d0e1757d5aa07887f2a828a4cd7c5aa453fdc (patch) | |
| tree | de598bf569d392b837c454eca51ed7e823305c4c /perl-install | |
| parent | e81614106311688a1932251f23ac42ad04ada4fe (diff) | |
| download | drakx-backup-do-not-use-922d0e1757d5aa07887f2a828a4cd7c5aa453fdc.tar drakx-backup-do-not-use-922d0e1757d5aa07887f2a828a4cd7c5aa453fdc.tar.gz drakx-backup-do-not-use-922d0e1757d5aa07887f2a828a4cd7c5aa453fdc.tar.bz2 drakx-backup-do-not-use-922d0e1757d5aa07887f2a828a4cd7c5aa453fdc.tar.xz drakx-backup-do-not-use-922d0e1757d5aa07887f2a828a4cd7c5aa453fdc.zip | |
syntax changes to make perl_checker happy
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/network/adsl.pm | 6 | ||||
| -rw-r--r-- | perl-install/network/modem.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 | ||||
| -rw-r--r-- | perl-install/security/main.pm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index c9e8969b8..2d3a6bee2 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -85,9 +85,9 @@ If you don't know, choose 'use pppoe'"), $l) or return; sub adsl_ask_info { my ($adsl, $netc, $intf, $adsl_type) = @_; my $pppoe_file = "/etc/ppp/pppoe.conf"; - my $pppoe_conf = { getVarsFromSh($pppoe_file) } if ($adsl_type =~ /pppoe/ && -f $pppoe_file); + my $pppoe_conf = { getVarsFromSh($pppoe_file) } if $adsl_type =~ /pppoe/ && -f $pppoe_file; add2hash($netc, { dnsServer2 => '', dnsServer3 => '', DOMAINNAME2 => '' }); - add2hash($adsl, { login => "$pppoe_conf->{USER}", passwd => '', passwd2 => '' }); + add2hash($adsl, { login => $pppoe_conf->{USER}, passwd => '', passwd2 => '' }); ask_info2($adsl, $netc); } @@ -103,7 +103,7 @@ sub adsl_conf { my ($adsl, $netc, $intf, $adsl_type) = @_; adsl_conf_step_1: - adsl_ask_info ($adsl, $netc, $intf, $adsl_type) or return; + adsl_ask_info($adsl, $netc, $intf, $adsl_type) or return; adsl_conf_step_2: $adsl_type =~ /speedtouch|eci/ or conf_network_card($netc, $intf, 'static', '10.0.0.10') or goto adsl_conf_step_1; adsl_conf_backend($adsl, $netc, $adsl_type); diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index 9478acf9f..c8a9e4722 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -19,7 +19,7 @@ sub configure { # $netcnx->{$netcnx->{type}} = {}; # $netcnx->{modem}{device} = $netc->{autodetect}{modem}; # modem_step_1: - $netcnx->{$netcnx->{type}}->{login} = ($netcnx->{$netcnx->{type}}->{auth} eq 'PAP' || $netcnx->{$netcnx->{type}}->{auth} eq 'CHAP') && $intf->{ppp0}{PAPNAME}; + $netcnx->{$netcnx->{type}}{login} = ($netcnx->{$netcnx->{type}}{auth} eq 'PAP' || $netcnx->{$netcnx->{type}}{auth} eq 'CHAP') && $intf->{ppp0}{PAPNAME}; pppConfig($netcnx->{$netcnx->{type}}, $mouse, $netc, $intf) or return; write_cnx_script($netc, "modem", q( diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 8f9b83136..09cbba81c 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -213,7 +213,7 @@ If you don't want to use the auto detection, deselect the checkbox. } ) or goto step_1; - load_conf ($netcnx, $netc, $intf); + load_conf($netcnx, $netc, $intf); $conf{modem} and do { pre_func("modem"); require network::modem; network::modem::configure($netcnx, $mouse, $netc, $intf) or goto step_2 }; $conf{winmodem} and do { pre_func("winmodem"); require network::modem; network::modem::winmodemConfigure($netc) or goto step_2 }; $conf{isdn} and do { pre_func("isdn"); require network::isdn; network::isdn::configure($netcnx, $netc) or goto step_2 }; diff --git a/perl-install/security/main.pm b/perl-install/security/main.pm index 00b2a79b4..20b3af2eb 100644 --- a/perl-install/security/main.pm +++ b/perl-install/security/main.pm @@ -14,7 +14,7 @@ my $w; # factorize this with rpmdrake and harddrake2 sub wait_msg { - my $mainw = ugtk2->new('wait', ( modal => 1, transient => $w->{rwindow} )); + my $mainw = ugtk2->new('wait', ( modal => 1, transient => $w->{rwindow})); my $label = new Gtk2::Label($_[0]); $mainw->{window}->add($label); $mainw->{window}->show_all; |