From 272a7f339aa75947b5c8430ab3ca59ec50566a38 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 24 Aug 2005 16:19:52 +0000 Subject: rewrite code to allow next commit --- perl-install/modules.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'perl-install') diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 028cd248d..456b9e92b 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -132,16 +132,17 @@ sub load_category { if_($category =~ /net/, 'bmac', 'gmac', 'mace', 'airport'), ) : (), ); - grep { + my @l = (probe_category($category), + map { { driver => $_, description => $_, try => 1 } } @try_modules); + + foreach (@l) { $o_wait_message->($_->{description}, $_->{driver}) if $o_wait_message; eval { load_and_configure($conf, $_->{driver}, $_->{options}) }; $_->{error} = $@; $_->{try} = 1 if member($_->{driver}, 'hptraid', 'ohci1394'); #- do not warn when this fails - - !($_->{error} && $_->{try}); - } probe_category($category), - map { { driver => $_, description => $_, try => 1 } } @try_modules; + } + grep { !($_->{error} && $_->{try}) } @l; } sub load_parallel_zip { -- cgit v1.2.1