summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-04-04 13:11:34 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-04-04 13:11:34 +0000
commit44244310d94110b989de92f7e3f84049b6ae2a6d (patch)
treea7a617282b69a09533c3c0f1d48ea053af91f5a3
parente8b08629486cf33f6ea155b436eaa86acb28e9e7 (diff)
downloaddrakx-44244310d94110b989de92f7e3f84049b6ae2a6d.tar
drakx-44244310d94110b989de92f7e3f84049b6ae2a6d.tar.gz
drakx-44244310d94110b989de92f7e3f84049b6ae2a6d.tar.bz2
drakx-44244310d94110b989de92f7e3f84049b6ae2a6d.tar.xz
drakx-44244310d94110b989de92f7e3f84049b6ae2a6d.zip
(setPackages): better handling for tv, photo and scanner
-rw-r--r--perl-install/install_any.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index c24674044..e4ab24928 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -329,8 +329,8 @@ sub setPackages {
$o->{compssUsersChoice}{$_} = 1
foreach map { @{$o->{compssUsers}{$_}{flags}} } 'Workstation|Office Workstation', 'Workstation|Internet station';
}
- $o->{compssUsersChoice}{TV} = 1 if grep { $_->{driver} eq 'bttv' } detect_devices::probeall();
- $o->{compssUsersChoice}{$_} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
+ $o->{compssUsersChoice}{uc($_)} = 1 foreach grep { modules::get_that_type($_) } ('tv', 'scanner', 'photo');
+ $o->{compssUsersChoice}{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
$o->{compssUsersChoice}{SYSTEM} = 1;
$o->{compssUsersChoice}{BURNER} = 1 if detect_devices::burners();
$o->{compssUsersChoice}{PCMCIA} = 1 if detect_devices::hasPCMCIA();