diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-12-01 09:52:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-12-01 09:52:57 +0000 |
| commit | 789a8842a51eba5a5f2c965ca39bccf2c1c402aa (patch) | |
| tree | 69788a61b603fa6bc06085f9c1a03e14c6287e48 | |
| parent | d936175793b95bec55b8e4fd6cfc116782503b08 (diff) | |
| download | drakx-789a8842a51eba5a5f2c965ca39bccf2c1c402aa.tar drakx-789a8842a51eba5a5f2c965ca39bccf2c1c402aa.tar.gz drakx-789a8842a51eba5a5f2c965ca39bccf2c1c402aa.tar.bz2 drakx-789a8842a51eba5a5f2c965ca39bccf2c1c402aa.tar.xz drakx-789a8842a51eba5a5f2c965ca39bccf2c1c402aa.zip | |
(configure) do not install packages in testing mode
| -rw-r--r-- | perl-install/network/adsl.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm index 5cf1423b8..ff4939583 100644 --- a/perl-install/network/adsl.pm +++ b/perl-install/network/adsl.pm @@ -33,30 +33,30 @@ If you don't know, choose 'use pppoe'"), ) or return; $type = find { $l{$_} eq $type } keys %l; if ($type eq 'pppoe') { - $in->do_pkgs->install("rp-$type"); + $in->do_pkgs->install("rp-$type") if !$::testing; $netcnx->{type} = "adsl_$type"; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; } if ($type eq 'dhcp') { - $in->do_pkgs->install(qw(dhcpcd)); + $in->do_pkgs->install(qw(dhcpcd)) if !$::testing; go_ethernet($netc, $intf, 'dhcp', '', '', $first_time) or goto conf_adsl_step1; } if ($type eq 'pptp') { - $in->do_pkgs->install(qw(pptp-adsl)); + $in->do_pkgs->install(qw(pptp-adsl)) if !$::testing; $netcnx->{type} = "adsl_$type"; $netcnx->{"adsl_$type"} = {}; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; } if ($type =~ /Sagem/) { $type = 'sagem' . ($type =~ /dhcp/ ? "_dhcp" : ""); - $in->do_pkgs->install(qw(adiusbadsl), if_($type =~ /dhcp/, qw(dhcpcd))); + $in->do_pkgs->install(qw(adiusbadsl), if_($type =~ /dhcp/, qw(dhcpcd))) if !$::testing; $netcnx->{type} = "adsl_$type"; $netcnx->{"adsl_$type"} = {}; adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1; } if ($type =~ /speedtouch/) { $type = 'speedtouch'; - $in->do_pkgs->install(qw(speedtouch)); + $in->do_pkgs->install(qw(speedtouch)) if !$::testing; $netcnx->{type} = "adsl_$type"; $netcnx->{"adsl_$type"} = {}; $netcnx->{"adsl_$type"}{vpivci} = ''; @@ -64,7 +64,7 @@ If you don't know, choose 'use pppoe'"), } # if ($type =~ /ECI/) { # $type = 'eci'; -# $in->do_pkgs->install(qw(eciadsl)); +# $in->do_pkgs->install(qw(eciadsl)) if !$::testing; # $netcnx->{type} = "adsl_$type"; # $netcnx->{"adsl_$type"} = {}; # $netcnx->{"adsl_$type"}{vpivci} = ''; |