summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-27 15:44:58 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-27 15:44:58 +0000
commit15f234bdfeb389a9578cb6e671ca897395cdcb66 (patch)
tree2c40705218d930f286c5986bc06e80c13a55e074 /perl-install
parent7ec9ca15b45cd08826368c003d1f98bad2a20472 (diff)
downloaddrakx-15f234bdfeb389a9578cb6e671ca897395cdcb66.tar
drakx-15f234bdfeb389a9578cb6e671ca897395cdcb66.tar.gz
drakx-15f234bdfeb389a9578cb6e671ca897395cdcb66.tar.bz2
drakx-15f234bdfeb389a9578cb6e671ca897395cdcb66.tar.xz
drakx-15f234bdfeb389a9578cb6e671ca897395cdcb66.zip
install needed packages w/o second thoughs
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 7413c1b61..6b2c8c86a 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -536,7 +536,7 @@ killall pppd
post => sub {
network::modem::ppp_configure($in, $modem);
$netc->{$_} = 'ppp0' foreach 'NET_DEVICE', 'NET_INTERFACE';
- $in->do_pkgs->ensure_is_installed('kdenetwork-kppp', '/usr/bin/kppp');
+ $in->do_pkgs->install('kdenetwork-kppp') if !-e '/usr/bin/kppp';
$handle_multiple_cnx->();
},
},
@@ -567,8 +567,8 @@ killall pppd
$adsl_device = { reverse %adsl_devices }->{$ntf_name} || $ntf_name; # ethernet device case
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' && ! -r '/usr/share/speedtouch/mgmt.o' && !$::testing) {
+ $in->do_pkgs->install($packages{$adsl_device}->[0]) if $packages{$adsl_device} && !-e $packages{$adsl_device}->[1];
+ if ($adsl_device eq 'speedtouch' && ! -r '$::prefix/usr/share/speedtouch/mgmt.o' && !$::testing) {
$in->do_pkgs->what_provides("speedtouch_mgmt") and
$in->do_pkgs->install('speedtouch_mgmt', 'auto');
return 'adsl_speedtouch_firmware' if ! -e "$::prefix/usr/share/speedtouch/mgmt.o";