diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-11-18 16:44:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-11-18 16:44:52 +0000 |
| commit | e9746d5b1868e7ecdbabce94c47325e05c2f666d (patch) | |
| tree | 0c1d2ca28c1c3c7fbddb81d4b3d29572895bded7 /perl-install/network | |
| parent | c7a67d1bcbcffaadbbb06be8f11e78e7508eed02 (diff) | |
| download | drakx-backup-do-not-use-e9746d5b1868e7ecdbabce94c47325e05c2f666d.tar drakx-backup-do-not-use-e9746d5b1868e7ecdbabce94c47325e05c2f666d.tar.gz drakx-backup-do-not-use-e9746d5b1868e7ecdbabce94c47325e05c2f666d.tar.bz2 drakx-backup-do-not-use-e9746d5b1868e7ecdbabce94c47325e05c2f666d.tar.xz drakx-backup-do-not-use-e9746d5b1868e7ecdbabce94c47325e05c2f666d.zip | |
make perl_checker happy
Diffstat (limited to 'perl-install/network')
| -rw-r--r-- | perl-install/network/adsl.pm | 8 | ||||
| -rw-r--r-- | perl-install/network/isdn.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index a8f51e2e3..206d81dea 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -20,16 +20,14 @@ sub configure { # N("The most common way to connect with adsl is pppoe. # Some connections use pptp, a few ones use dhcp. # If you don't know, choose 'use pppoe'"), [N_("use pppoe"), N_("use pptp"), N_("use dhcp"), N_("Alcatel speedtouch usb"), N_("ECI Hi-Focus")]) or return; - my @l = ( - [N_("use pppoe"), + my $l = [N_("use pppoe"), N_("use pptp"), N_("use dhcp"), - N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected")] - ); + N_("Alcatel speedtouch usb") . if_($netc->{autodetect}{adsl}{speedtouch}, " - detected")]; my $type = $in->ask_from_list_(N("Connect to the Internet"), N("The most common way to connect with adsl is pppoe. Some connections use pptp, a few ones use dhcp. -If you don't know, choose 'use pppoe'"), @l) or return; +If you don't know, choose 'use pppoe'"), $l) or return; $type =~ s/use //; if ($type eq 'pppoe') { $in->do_pkgs->install("rp-$type"); diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm index e6997351e..a0f766333 100644 --- a/perl-install/network/isdn.pm +++ b/perl-install/network/isdn.pm @@ -257,7 +257,7 @@ sub isdn_detect { sub isdn_detect_backend { my ($isdn) = @_; - if (my ($c) = (modules::probe_category('network/isdn'))) { + if (my ($c) = modules::probe_category('network/isdn')) { $isdn->{$_} = $c->{$_} foreach qw(description vendor id driver options firmware); $isdn->{$_} = sprintf("%0x", $isdn->{$_}) foreach 'vendor', 'id'; $isdn->{card_type} = 'pci'; diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 007dfbe30..07ee52d96 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -228,7 +228,7 @@ If you don't want to use the auto detection, deselect the checkbox. if ($nb < 1) { } elsif ($nb > 1) { $in->ask_from(N("Network Configuration Wizard"), - N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n" . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center")), + N("You have configured multiple ways to connect to the Internet.\nChoose the one you want to use.\n\n") . if_(!$::isStandalone, "You may want to configure some profiles after the installation, in the Mandrake Control Center"), [ { label => N("Internet connection"), val => \$netc->{internet_cnx_choice}, list => [ keys %{$netc->{internet_cnx}} ] } ] ) or goto step_2; } elsif ($nb == 1) { |