diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-26 15:53:40 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-26 15:53:40 +0000 |
| commit | 2ca048aa17c1909db1c7a76cf774430919f725bf (patch) | |
| tree | 49d634ab1e1bb80a64a9141b0d898ee89abca6f4 | |
| parent | 92613c9690d32d5904d63203b57c895fe10a266e (diff) | |
| download | drakx-2ca048aa17c1909db1c7a76cf774430919f725bf.tar drakx-2ca048aa17c1909db1c7a76cf774430919f725bf.tar.gz drakx-2ca048aa17c1909db1c7a76cf774430919f725bf.tar.bz2 drakx-2ca048aa17c1909db1c7a76cf774430919f725bf.tar.xz drakx-2ca048aa17c1909db1c7a76cf774430919f725bf.zip | |
make wizard be faster when trying to install speedtouch_mgmt and when firmware
is already present
| -rw-r--r-- | perl-install/network/netconnect.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 29aabef96..4fd3f03fb 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -544,9 +544,9 @@ killall pppd return 'adsl_unsupported_eci' if $adsl_device eq 'eci'; $netconnect::need_restart_network = member($adsl_device, qw(speedtouch eci)); $in->do_pkgs->ensure_is_installed(@{$packages{$adsl_device}}) if $packages{$adsl_device}; - if ($adsl_device eq 'speedtouch' && !$::testing) { + if ($adsl_device eq 'speedtouch' && ! -r '/usr/share/speedtouch/mgmt.o' && !$::testing) { $in->do_pkgs->what_provides("speedtouch_mgmt") and - $in->do_pkgs->ensure_is_installed('speedtouch_mgmt', '/usr/share/speedtouch/mgmt.o', 'auto'); + $in->do_pkgs->install('speedtouch_mgmt', 'auto'); return 'adsl_speedtouch_firmware' if ! -e "$prefix/usr/share/speedtouch/mgmt.o"; } return 'adsl_provider' if $adsl_devices{$adsl_device}; |