summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-08-24 16:19:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-08-24 16:19:52 +0000
commit272a7f339aa75947b5c8430ab3ca59ec50566a38 (patch)
treec38777efc2bff1c1ca40a1d6db7d917c541475fc /perl-install
parent6ff062ef326d4fd1afedb080a82f0c6cc5d7aeb9 (diff)
downloaddrakx-272a7f339aa75947b5c8430ab3ca59ec50566a38.tar
drakx-272a7f339aa75947b5c8430ab3ca59ec50566a38.tar.gz
drakx-272a7f339aa75947b5c8430ab3ca59ec50566a38.tar.bz2
drakx-272a7f339aa75947b5c8430ab3ca59ec50566a38.tar.xz
drakx-272a7f339aa75947b5c8430ab3ca59ec50566a38.zip
rewrite code to allow next commit
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm11
1 files changed, 6 insertions, 5 deletions
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 {