diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-06-04 20:21:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-06-04 20:21:21 +0000 |
| commit | b6bcdeab43b2efaa398e6a24dd87c279c70e5373 (patch) | |
| tree | 56135be52e59300d3c572155e329678dfc623257 | |
| parent | aa25a178c1da85a0247bf4e370060aff2008b1c9 (diff) | |
| download | drakx-b6bcdeab43b2efaa398e6a24dd87c279c70e5373.tar drakx-b6bcdeab43b2efaa398e6a24dd87c279c70e5373.tar.gz drakx-b6bcdeab43b2efaa398e6a24dd87c279c70e5373.tar.bz2 drakx-b6bcdeab43b2efaa398e6a24dd87c279c70e5373.tar.xz drakx-b6bcdeab43b2efaa398e6a24dd87c279c70e5373.zip | |
(new,_setup_and_start_X) fix fallbacking on curses install aka abort
gtk install startup if X failed to start
issue introduced in r2434 on Dec 16 2011:
"(_setup_and_start_X) split it out of new()"
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 5f99aaff3..853845425 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix fallbacking on curses install aka abort gtk install startup if X + failed to start - switch from Ia Ora to Oxygen Gtk theme - use proper design from original author diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index c026bf174..a0ddca73e 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -36,7 +36,7 @@ sub new($$) { if (!$::local_install && ($::testing ? $ENV{DISPLAY} ne $wanted_DISPLAY : $ENV{DISPLAY} =~ /^:\d/)) { #- is the display local or distant? - _setup_and_start_X($o, $wanted_DISPLAY); + _setup_and_start_X($o, $wanted_DISPLAY) or return; } $ENV{DISPLAY} = $wanted_DISPLAY; @@ -96,7 +96,7 @@ sub _setup_and_start_X { and return; } else { $o->{vga16} = 1 if /VGA16/; - _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) and return; + _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) and return 1; } } return undef; |