diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-08 08:51:35 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-03-08 08:51:35 +0000 |
| commit | 871e9f00423da3032dcfd1730a99522602312462 (patch) | |
| tree | ebae3750ed3c7f6eac608d99a8a111499c5e750c | |
| parent | 1bee39ce143a829067fda56d35ee7f97f8890490 (diff) | |
| download | drakx-backup-do-not-use-871e9f00423da3032dcfd1730a99522602312462.tar drakx-backup-do-not-use-871e9f00423da3032dcfd1730a99522602312462.tar.gz drakx-backup-do-not-use-871e9f00423da3032dcfd1730a99522602312462.tar.bz2 drakx-backup-do-not-use-871e9f00423da3032dcfd1730a99522602312462.tar.xz drakx-backup-do-not-use-871e9f00423da3032dcfd1730a99522602312462.zip | |
simplify speedtouch firmware installation through newly introduced
do_pkg::ensure_is_installed_if_availlable()
| -rw-r--r-- | perl-install/network/netconnect.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 4397cf380..67692ea7d 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -555,9 +555,8 @@ killall pppd return 'adsl_unsupported_eci' if $ntf_name eq 'eci'; $need_restart_network = member($ntf_name, qw(speedtouch eci)); $in->do_pkgs->install($packages{$ntf_name}->[0]) if $packages{$ntf_name} && !-e $packages{$ntf_name}->[1]; - if ($ntf_name eq 'speedtouch' && ! -r '$::prefix/usr/share/speedtouch/mgmt.o' && !$::testing) { - $in->do_pkgs->what_provides("speedtouch_mgmt") and - $in->do_pkgs->install('speedtouch_mgmt'); + if ($ntf_name eq 'speedtouch') { + $in->do_pkgs->ensure_is_installed_if_availlable('speedtouch_mgmt', '$::prefix/usr/share/speedtouch/mgmt.o'); return 'adsl_speedtouch_firmware' if ! -e "$::prefix/usr/share/speedtouch/mgmt.o"; } return 'adsl_provider' if $adsl_devices{$ntf_name}; |