diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-08-27 08:09:57 +0000 |
| commit | 6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab (patch) | |
| tree | 23df90df1d2b45befe8d62f5f452399d2a79f394 /perl-install/install_any.pm | |
| parent | 2e7bec9cf05c2ad1d747260087aab55f00656915 (diff) | |
| download | drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.gz drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.bz2 drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.tar.xz drakx-6c9e831de8a374dbbd7a0fdfbf137b8f3fc064ab.zip | |
add __regexp suffix to matching_desc() and matching_driver()
Diffstat (limited to 'perl-install/install_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4410aa947..a64dade5e 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -596,20 +596,20 @@ sub setDefaultPackages { $o->{rpmsrate_flags_chosen}{CDCOM} = 1 if any { $_->{descr} =~ /commercial/i } values %{$o->{packages}{mediums}}; $o->{rpmsrate_flags_chosen}{TV} = 1 if detect_devices::getTVcards(); $o->{rpmsrate_flags_chosen}{'3D'} = 1 if - detect_devices::matching_desc('Matrox.* G[245][05]0') || - detect_devices::matching_desc('Rage X[CL]') || - detect_devices::matching_desc('3D Rage (?:LT|Pro)') || - detect_devices::matching_desc('Voodoo [35]') || - detect_devices::matching_desc('Voodoo Banshee') || - detect_devices::matching_desc('8281[05].* CGC') || - detect_devices::matching_desc('Rage 128') || - detect_devices::matching_desc('Radeon ') || #- all Radeon card are now 3D with 4.3.0 - detect_devices::matching_desc('[nN]Vidia.*T[nN]T2') || #- TNT2 cards - detect_devices::matching_desc('[nN][vV]idia.*NV[56]') || - detect_devices::matching_desc('[nN][vV]idia.*Vanta') || - detect_devices::matching_desc('[nN][vV]idia.*[gG]e[fF]orce') || #- GeForce cards - detect_devices::matching_desc('[nN][vV]idia.*NV1[15]') || - detect_devices::matching_desc('[nN][vV]idia.*Quadro'); + detect_devices::matching_desc__regexp('Matrox.* G[245][05]0') || + detect_devices::matching_desc__regexp('Rage X[CL]') || + detect_devices::matching_desc__regexp('3D Rage (?:LT|Pro)') || + detect_devices::matching_desc__regexp('Voodoo [35]') || + detect_devices::matching_desc__regexp('Voodoo Banshee') || + detect_devices::matching_desc__regexp('8281[05].* CGC') || + detect_devices::matching_desc__regexp('Rage 128') || + detect_devices::matching_desc__regexp('Radeon ') || #- all Radeon card are now 3D with 4.3.0 + detect_devices::matching_desc__regexp('[nN]Vidia.*T[nN]T2') || #- TNT2 cards + detect_devices::matching_desc__regexp('[nN][vV]idia.*NV[56]') || + detect_devices::matching_desc__regexp('[nN][vV]idia.*Vanta') || + detect_devices::matching_desc__regexp('[nN][vV]idia.*[gG]e[fF]orce') || #- GeForce cards + detect_devices::matching_desc__regexp('[nN][vV]idia.*NV1[15]') || + detect_devices::matching_desc__regexp('[nN][vV]idia.*Quadro'); my @locale_pkgs = map { pkgs::packagesProviding($o->{packages}, 'locales-' . $_) } lang::langsLANGUAGE($o->{locale}{langs}); |