summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-24 14:39:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-24 14:39:04 +0000
commit78aef7f66bb62da23ff87ba2f24fb5e33637c0be (patch)
treeb1d68271287e98d5ba9c7ca648795c28de0c85f0 /perl-install/install_steps_interactive.pm
parent752767dd8bb3b25b3566fdc4087b79e2a572d4e9 (diff)
downloaddrakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.gz
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.bz2
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.tar.xz
drakx-78aef7f66bb62da23ff87ba2f24fb5e33637c0be.zip
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm17
1 files changed, 10 insertions, 7 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index e8540b176..f7aa39acf 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1148,19 +1148,22 @@ sub load_thiskind {
modules::add_alias("sound", $c);
}
}
- my @l = eval { modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia) };
- $@ and $o->errorInStep($@), return undef;
- @l;
+ modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia);
}
#------------------------------------------------------------------------------
sub setup_thiskind {
my ($o, $type, $auto, $at_least_one) = @_;
- # load_thiskind returns undef in case of error
- my @l = $o->load_thiskind($type) if !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
- return if defined @l && $auto && (@l || !$at_least_one);
-
+ my @l;
+ if (!$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1)) {
+ eval { @l = $o->load_thiskind($type) };
+ if ($@) {
+ $o->errorInStep($@);
+ } else {
+ return if $auto && (@l || !$at_least_one);
+ }
+ }
while (1) {
my $msg = @l ?
[ _("Found %s %s interfaces", join(", ", map { $_->[0] } @l), $type),