diff options
| -rw-r--r-- | perl-install/any.pm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index be1ff5e28..d43ce2804 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -490,9 +490,10 @@ sub setup_thiskind { my ($in, $type, $auto, $at_least_one) = @_; return if arch() eq "ppc"; - my @l=setup_thiskind_backend ($type, $auto, $at_least_one, sub { my $w = wait_load_module($in, $type, @_) } ); + my @l; if (!$::noauto) { + @l = setup_thiskind_backend ($type, sub { my $w = wait_load_module($in, $type, @_) } ); if (my @err = grep { $_ } map { $_->{error} } @l) { $in->ask_warn('', join("\n", @err)); } @@ -522,19 +523,12 @@ sub setup_thiskind { # setup_thiskind_backend : setup the kind of hardware # input : # $type : typeof hardware to setup -# $auto : automatic behaviour -# $at_least_one : +# $wait_function : function to display a wait message. : ex $wait_function=sub { $w = wait_load_module($in, $type, @_) } # output: # @l : list of loaded sub setup_thiskind_backend { - my ($type, $auto, $at_least_one, $wait_function) = @_; - #- for example $wait_function=sub { $w = wait_load_module($in, $type, @_) } - - my @l; - if (!$::noauto) { - @l = modules::load_thiskind($type, $wait_function ); - return @l if $auto && (@l || !$at_least_one); - } + my ($type, $wait_function) = @_; + modules::load_thiskind($type, $wait_function ); } sub wait_load_module { |