summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-28 12:56:26 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-28 12:56:26 +0000
commit5fd046ac65b74d9b9b5c18bbb9579329f4036c49 (patch)
tree7787538c42e634c8e9935866048bfcfb282a7ef8 /perl-install
parentf902492a01c974283c9c800ddbd5de651c474c25 (diff)
downloaddrakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.gz
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.bz2
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.tar.xz
drakx-5fd046ac65b74d9b9b5c18bbb9579329f4036c49.zip
no_comment
Diffstat (limited to 'perl-install')
-rwxr-xr-xperl-install/g_auto_install4
-rw-r--r--perl-install/interactive.pm10
-rw-r--r--perl-install/interactive_gtk.pm11
3 files changed, 13 insertions, 12 deletions
diff --git a/perl-install/g_auto_install b/perl-install/g_auto_install
index 41a5d3303..cb5ed3cc7 100755
--- a/perl-install/g_auto_install
+++ b/perl-install/g_auto_install
@@ -1,7 +1,5 @@
#!../perl
-@ARGV == 0 or die "usage: $0\n";
-
my $dir = `pwd`;
chomp $dir;
$dir .= "/../../..";
@@ -10,4 +8,4 @@ $ENV{PERL5LIB} = join ":", map { "$dir/$_" } @INC;
$ENV{LD_LIBRARY_PATH} = "$dir/usr/lib";
$ENV{PATH} = join ":", map { "$dir/$_" } split ":", "/usr/bin:/bin:/sbin:/usr/sbin:/usr/X11R6/bin";
-exec "../perl", "./install2", "--g_auto_install" or die;
+exec "../perl", "./install2", "--g_auto_install", @ARGV or die;
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 2a18767e4..a6a8a1341 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -154,15 +154,7 @@ sub wait_message($$$) {
$b;
}
-sub kill {
- my ($o) = @_;
- $o->{before_killing} ||= 0;
- while (@interactive::objects > $o->{before_killing}) {
- my $w = pop @interactive::objects;
- $w->destroy;
- }
- $o->{before_killing} = @interactive::objects;
-}
+sub kill {}
#-######################################################################################
#- Wonderful perl :(
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index f730cc2e6..95c668378 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -222,3 +222,14 @@ sub wait_message_endW {
my ($o, $w) = @_;
$w->destroy;
}
+
+sub kill {
+ my ($o) = @_;
+ $o->{before_killing} ||= 0;
+ while (@interactive::objects > $o->{before_killing}) {
+ my $w = pop @interactive::objects;
+ $w->destroy;
+ }
+ @my_gtk::grabbed = ();
+ $o->{before_killing} = @interactive::objects;
+}