diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-02-10 14:35:25 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-02-10 14:35:25 +0000 |
| commit | f9f1423df0fc6aea175ddb003922222c22af1dc8 (patch) | |
| tree | 7e7d048c8b7b61c5b7e3da8168d97b0bc6a8d389 /perl-install | |
| parent | 6ecbdc83f9ecfa5c44b830b48928227b706c9351 (diff) | |
| download | drakx-f9f1423df0fc6aea175ddb003922222c22af1dc8.tar drakx-f9f1423df0fc6aea175ddb003922222c22af1dc8.tar.gz drakx-f9f1423df0fc6aea175ddb003922222c22af1dc8.tar.bz2 drakx-f9f1423df0fc6aea175ddb003922222c22af1dc8.tar.xz drakx-f9f1423df0fc6aea175ddb003922222c22af1dc8.zip | |
do not complain about no tv cards when there're but they do not
require any configuration beyond loading proper module (#7443, #11270
and the like)
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/drakxtv | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index 709c13309..ac199065d 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -115,9 +115,12 @@ sub scan4channels() { my @devices = detect_devices::getTVcards(); push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices; -if (@devices) { +my ($devices, $devices_ok) = partition { detect_devices::isTVcard($_) } @devices; + +my $modules_conf; + +if (@devices = @$devices) { my $not_canceled = 1; - my $modules_conf; # TODO: That need some work for multiples TV cards each_index { if (($< == 0 || $::testing) && (grep { detect_devices::isTVcard($_) } @devices)) { @@ -130,7 +133,15 @@ if (@devices) { } scan4channels() if $not_canceled; } @devices -} else { +} + +if (@devices = @$devices_ok) { + require modules; + $modules_conf ||= modules::any_conf->read; + $modules_conf->write; +} + +if (!$devices && !$devices_ok) { $in->ask_warn(N("No TV Card detected!"), formatAlaTeX( #-PO: keep the double empty lines between sections, this is formatted a la LaTeX N("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in. |