summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-01-27 07:33:45 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-01-27 07:33:45 +0000
commit02f112fe20b167ebed9fbbb0bb95421665f689c9 (patch)
tree5c3fb11c89a0cfe0195212484257a06d254751bf
parent52c3b495a1eeb723b97ebf2b76c89fec1bd0062b (diff)
downloaddrakx-backup-do-not-use-02f112fe20b167ebed9fbbb0bb95421665f689c9.tar
drakx-backup-do-not-use-02f112fe20b167ebed9fbbb0bb95421665f689c9.tar.gz
drakx-backup-do-not-use-02f112fe20b167ebed9fbbb0bb95421665f689c9.tar.bz2
drakx-backup-do-not-use-02f112fe20b167ebed9fbbb0bb95421665f689c9.tar.xz
drakx-backup-do-not-use-02f112fe20b167ebed9fbbb0bb95421665f689c9.zip
this patch enable doc team to take snapshot of drakxtv even if they do not
have any card: - running "/usr/sbin/drakxtv" will enable to take snapshot of error message when xawtv wasn't installed by the drakx installer - running "/usr/sbin/drakxtv --testing" will emulate a fake dummy tv card so that one is able to take snapshots of configuring a tv card
-rwxr-xr-xperl-install/standalone/drakxtv3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index ebcdf4ce7..d373b6e05 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -40,7 +40,7 @@ sub scan4channels {
# -x "/usr/bin/scantv" or {
#{ exec {'consolehelper'} $0, ("urpmi", "xawtv") or die N("consolehelper missing");
# };
- if (! -x "/usr/bin/scantv") {
+ if (!$::testing && ! -x "/usr/bin/scantv") {
# log::explanations("package xawtv isn't installed");
$in->ask_warn("XawTV isn't installed!",
formatAlaTeX(N("XawTV isn't installed!
@@ -130,6 +130,7 @@ 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(1);
+push @devices, { driver => 'bttv', description => 'dummy' } if $::testing && !@devices;
if (@devices) {
# TODO: That need some work for multiples TV cards
foreach (@devices) {