From 0389f5e245a572f88b4ca3b79e97c496d2537a09 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 26 May 2005 08:17:27 +0000 Subject: replace unused $o->{localInstall} with $::local_install, partially used instead of $::uml_install and used in drakx-in-chroot --- perl-install/install_steps_gtk.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'perl-install/install_steps_gtk.pm') diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 764fae2f8..59f50ccdb 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -33,7 +33,8 @@ sub new($$) { $ENV{DISPLAY} ||= $o->{display} || ":0"; my $wanted_DISPLAY = $::testing && -x '/usr/X11R6/bin/Xnest' ? ':9' : $ENV{DISPLAY}; - if ($ENV{DISPLAY} =~ /^:\d/ && !$::testing || $ENV{DISPLAY} ne $wanted_DISPLAY) { #- is the display local or distant? + if (!$::local_install && + ($::testing ? $ENV{DISPLAY} ne $wanted_DISPLAY : $ENV{DISPLAY} =~ /^:\d/)) { #- is the display local or distant? my $f = "/tmp/Xconf"; if (!$::testing) { devices::make("/dev/kbd"); -- cgit v1.2.1