diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-14 13:29:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-14 13:29:03 +0000 |
| commit | 1d82355498615fa58522225bb1e7c259d9ae6f8b (patch) | |
| tree | 8c5053e95ee78f0aae69af9c0252725a9581dc48 /perl-install/Xconfigurator.pm | |
| parent | 8bcd44804244f5b6b5b828a07dcd54ec70dc3f37 (diff) | |
| download | drakx-backup-do-not-use-1d82355498615fa58522225bb1e7c259d9ae6f8b.tar drakx-backup-do-not-use-1d82355498615fa58522225bb1e7c259d9ae6f8b.tar.gz drakx-backup-do-not-use-1d82355498615fa58522225bb1e7c259d9ae6f8b.tar.bz2 drakx-backup-do-not-use-1d82355498615fa58522225bb1e7c259d9ae6f8b.tar.xz drakx-backup-do-not-use-1d82355498615fa58522225bb1e7c259d9ae6f8b.zip | |
(use vars): fix stew sux
(testFinalConfig): nicer stderr handling
Diffstat (limited to 'perl-install/Xconfigurator.pm')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 7819d3b93..ee50b8594 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -2,7 +2,7 @@ package Xconfigurator; # $Id$ use diagnostics; use strict; -use vars qw($in $install @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4); +use vars qw($in $install @window_managers @depths @monitorSize2resolution @hsyncranges %min_hsync4wres @vsyncranges %depths @resolutions %serversdriver @svgaservers @accelservers @allbutfbservers @allservers %vgamodes %videomemory @ramdac_name @ramdac_id @clockchip_name @clockchip_id %keymap_translate %standard_monitors $XF86firstchunk_text $keyboardsection_start $keyboardsection_start_v4 $keyboardsection_part2 $keyboardsection_part3 $keyboardsection_part3_v4 $keyboardsection_end $pointersection_text $monitorsection_text1 $monitorsection_text2 $monitorsection_text3 $monitorsection_text4 $modelines_text_Trident_TG_96xx $modelines_text $devicesection_text $devicesection_text_v4 $screensection_text1 %lines @options %xkb_options $good_default_monitor $low_default_monitor $layoutsection_v4 $modelines_text_apple); use common qw(:common :file :functional :system); use log; @@ -580,7 +580,7 @@ sub testFinalConfig { } local *F; - open F, "|perl" or die ''; + open F, "|perl 2>/dev/null" or die ''; print F "use lib qw(", join(' ', @INC), ");\n"; print F q{ use interactive_gtk; @@ -605,7 +605,8 @@ sub testFinalConfig { -r "} . $prefix . q{/$background" && -x "} . $prefix . q{/$qiv" and system(($::testing ? "} . $prefix . q{" : "chroot } . $prefix . q{/ ") . "$qiv -y $background"); - exit (interactive_gtk->new->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222); + my $in = interactive_gtk->new; + $in->exit($in->ask_yesorno('', [ _("Is this the correct setting?"), $text ], 0) ? 0 : 222); }; my $rc = close F; my $err = $?; |