summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-02-03 23:06:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-02-03 23:06:57 +0000
commit881cee34cfdb5e7781e060295b47e883d51df28b (patch)
treec1eae1dc89a86bc7b26f8255db880065da1cb165
parent1886a4b1d8d79401dd03c2bf4b4161af920446bb (diff)
downloaddrakx-backup-do-not-use-881cee34cfdb5e7781e060295b47e883d51df28b.tar
drakx-backup-do-not-use-881cee34cfdb5e7781e060295b47e883d51df28b.tar.gz
drakx-backup-do-not-use-881cee34cfdb5e7781e060295b47e883d51df28b.tar.bz2
drakx-backup-do-not-use-881cee34cfdb5e7781e060295b47e883d51df28b.tar.xz
drakx-backup-do-not-use-881cee34cfdb5e7781e060295b47e883d51df28b.zip
fix test mode install when Xnest is not there
-rw-r--r--perl-install/install_steps_gtk.pm2
1 files changed, 1 insertions, 1 deletions
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]);