diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-08-21 14:17:33 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-08-21 14:17:33 +0000 |
| commit | f98aa287d37918c9d8ff9220459a0c6305adde37 (patch) | |
| tree | b57f453b9c2ea3cf596abd3347df05cf6a545634 | |
| parent | 532d9676ffe9aec77786a2a520a364b4906de4e7 (diff) | |
| download | drakx-f98aa287d37918c9d8ff9220459a0c6305adde37.tar drakx-f98aa287d37918c9d8ff9220459a0c6305adde37.tar.gz drakx-f98aa287d37918c9d8ff9220459a0c6305adde37.tar.bz2 drakx-f98aa287d37918c9d8ff9220459a0c6305adde37.tar.xz drakx-f98aa287d37918c9d8ff9220459a0c6305adde37.zip | |
only offer to configure xawtv if bttv was configured
| -rwxr-xr-x | perl-install/standalone/drakxtv | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index dc267258a..1a50920d1 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -131,17 +131,17 @@ You can install it by typing \"urpmi xawtv\" as root, in a console."))); my @devices = grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' || $_->{driver} eq 'usbvision' } detect_devices::probeall(); push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices; if (@devices) { + my $not_canceled = 1; # TODO: That need some work for multiples TV cards foreach (@devices) { if ($< == 0 && (grep { detect_devices::isTVcard($_) } @devices)) { require harddrake::v4l; require modules; - no strict 'subs'; modules::read_conf(); - harddrake::v4l::config($in, $_->{driver}); + $not_canceled &&= harddrake::v4l::config($in, $_->{driver}); modules::write_conf(); } - scan4channels(); + scan4channels() if $not_canceled; } } else { $in->ask_warn(N("No TV Card detected!"), formatAlaTeX( |