summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-09-09 11:02:04 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-09-09 11:02:04 +0000
commit92a2f3908524627fa0c86c93cfc8f6db9b211eab (patch)
treee07b5a4ae015f9ffbf3068e4e583a351a70cf1a5
parent3a6737ee923c16db0885a0320baeed43b88a201f (diff)
downloaddrakx-92a2f3908524627fa0c86c93cfc8f6db9b211eab.tar
drakx-92a2f3908524627fa0c86c93cfc8f6db9b211eab.tar.gz
drakx-92a2f3908524627fa0c86c93cfc8f6db9b211eab.tar.bz2
drakx-92a2f3908524627fa0c86c93cfc8f6db9b211eab.tar.xz
drakx-92a2f3908524627fa0c86c93cfc8f6db9b211eab.zip
- use variable $::no_ugtk_init in ugtk.pm instead of using $::isInstall
- that way, the X test can be made to work both at install and standalone
-rw-r--r--perl-install/Xconfig/test.pm2
-rw-r--r--perl-install/install2.pm1
-rw-r--r--perl-install/ugtk.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfig/test.pm b/perl-install/Xconfig/test.pm
index dff5fd261..fec3bffe7 100644
--- a/perl-install/Xconfig/test.pm
+++ b/perl-install/Xconfig/test.pm
@@ -100,7 +100,7 @@ sub test {
open F, "|perl 2>/dev/null";
print F "use lib qw(", join(' ', @INC), ");\n";
print F q{
- BEGIN { $::isInstall = 1 }
+ BEGIN { $::no_ugtk_init = 1 }
require lang;
require my_gtk;
my_gtk->import(qw(:wrappers)); #- help perl_checker
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 11149214b..6fbc15ff5 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -347,6 +347,7 @@ sub main {
umask 022;
$::isInstall = 1;
+ $::no_ugtk_init = 1;
$::expert = $::g_auto_install = 0;
#- c::unlimit_core() unless $::testing;
diff --git a/perl-install/ugtk.pm b/perl-install/ugtk.pm
index 4b062a533..5c05a31a7 100644
--- a/perl-install/ugtk.pm
+++ b/perl-install/ugtk.pm
@@ -15,7 +15,7 @@ $EXPORT_TAGS{all} = [ map { @$_ } values %EXPORT_TAGS ];
use Gtk;
-unless ($::isInstall) {
+if (!$::no_ugtk_init) {
!$ENV{DISPLAY} || system('/usr/X11R6/bin/xtest') and die "Cannot be run in console mode.\n";
Gtk->init;
eval { require Gtk::Gdk::Pixbuf; Gtk::Gdk::Pixbuf->init };