From 881cee34cfdb5e7781e060295b47e883d51df28b Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 3 Feb 2003 23:06:57 +0000 Subject: fix test mode install when Xnest is not there --- perl-install/install_steps_gtk.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install') diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 169e6804b..fd853f1b4 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -34,7 +34,7 @@ sub new($$) { $ENV{DISPLAY} ||= $o->{display} || ":0"; my $wanted_DISPLAY = $::testing && -x '/usr/X11R6/bin/Xnest' ? ':1' : $ENV{DISPLAY}; - if ($ENV{DISPLAY} =~ /^:\d/ || $ENV{DISPLAY} ne $wanted_DISPLAY) { #- is the display local or distant? + if ($ENV{DISPLAY} =~ /^:\d/ && !$::testing || $ENV{DISPLAY} ne $wanted_DISPLAY) { #- is the display local or distant? my $f = "/tmp/Xconf"; if (!$::testing) { install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0]); -- cgit v1.2.1