diff options
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/interactive/gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 286f05c4a..2c1077e26 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -607,6 +607,10 @@ sub main { next MAIN unless $o->{steps}{$o->{step}}{reachable}; #- sanity check: avoid a step not reachable on error. redo MAIN; } + + my $_w = $o->wait_message('foo', "fsqfdlsk jfmqdslkf jqlsdmkf mlkqjd jlmkq\nqdsfqdsfqsdfqdsf\nqdsfqsdf"); + sleep 10; + $o->{steps}{$o->{step}}{done} = 1; $o->leavingStep($o->{step}); diff --git a/perl-install/interactive/gtk.pm b/perl-install/interactive/gtk.pm index b0e459aab..43fc50282 100644 --- a/perl-install/interactive/gtk.pm +++ b/perl-install/interactive/gtk.pm @@ -678,7 +678,7 @@ sub wait_messageW($$$) { $box->pack_start(shift @l, 0, 0, 4); $box->pack_start($_, 1, 1, 4) foreach @l; - ($w->{wait_messageW} = $l[$#l])->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); + ($w->{wait_messageW} = $l[-1])->signal_connect(expose_event => sub { $w->{displayed} = 1; 0 }); $w->{rwindow}->set_position('center') if $::isStandalone && !$w->{isEmbedded} && !$w->{isWizard}; $w->{window}->show_all; $w->sync until $w->{displayed}; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index f787c60c7..3f35f9cff 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -458,7 +458,7 @@ sub read_rpmsrate { @l = grep { $_->[0] < length $indent } @l; - my @m = @l ? @{$l[$#l][1]} : (); + my @m = @l ? @{$l[-1][1]} : (); my ($t, $flag, @l2); while ($data =~ /^(( @@ -515,7 +515,7 @@ sub read_rpmsrate { } push @l, @l2; } else { - push @l, [ $l2[0][0], $l2[$#l2][1] ]; + push @l, [ $l2[0][0], $l2[-1][1] ]; } } $fatal_error and die "$fatal_error fatal errors in rpmsrate"; |