diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 16:56:24 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-08-22 16:56:24 +0000 |
| commit | 76c708d7ad362aaaea3416936119510c156135b2 (patch) | |
| tree | 167a7d642a9e5e95526bdf57967d8e906018ef42 /perl-install/Xconfig/test.pm | |
| parent | a5a0d13005490f58a309d05d37d2a938aa98ef14 (diff) | |
| download | drakx-backup-do-not-use-76c708d7ad362aaaea3416936119510c156135b2.tar drakx-backup-do-not-use-76c708d7ad362aaaea3416936119510c156135b2.tar.gz drakx-backup-do-not-use-76c708d7ad362aaaea3416936119510c156135b2.tar.bz2 drakx-backup-do-not-use-76c708d7ad362aaaea3416936119510c156135b2.tar.xz drakx-backup-do-not-use-76c708d7ad362aaaea3416936119510c156135b2.zip | |
- do not display "Test" button when bad card and during install (instead of disabling it)
- after install, always display "Test" button but warn strongly not to test
Diffstat (limited to 'perl-install/Xconfig/test.pm')
| -rw-r--r-- | perl-install/Xconfig/test.pm | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm index 04074f042..0648a28b1 100644 --- a/perl-install/Xconfig/test.pm +++ b/perl-install/Xconfig/test.pm @@ -20,11 +20,17 @@ sub xtest { } sub test { - my ($in, $raw_X, $card, $auto) = @_; + my ($in, $raw_X, $card, $auto, $skip_badcard) = @_; - Xconfig::card::check_bad_card($card) or return 1; - $in->ask_yesorno(_("Test of the configuration"), _("Do you want to test the configuration?"), 1) or return 1 if !$auto; + my $bad_card = !Xconfig::card::check_bad_card($card); + return 1 if $skip_badcard && $bad_card; + if ($bad_card || !$auto) { + my $msg = + $in->ask_yesorno(_("Test of the configuration"), + _("Do you want to test the configuration?") . ($bad_card ? "\n" . _("Warning: testing this graphic card may freeze your computer") : ''), + !$bad_card) or return 1; + } unlink "$::prefix/tmp/.X9-lock"; |