diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-10-15 14:35:58 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-10-15 14:35:58 +0000 |
| commit | 39def6996941bb414d0d6ac9d50ba49933869017 (patch) | |
| tree | b5caa7bac29e28a3a12f94e4d9eae22d4b642b4a | |
| parent | 4eb12bd3c2b072e0a8b1b22422104b8d71f245d1 (diff) | |
| download | drakx-39def6996941bb414d0d6ac9d50ba49933869017.tar drakx-39def6996941bb414d0d6ac9d50ba49933869017.tar.gz drakx-39def6996941bb414d0d6ac9d50ba49933869017.tar.bz2 drakx-39def6996941bb414d0d6ac9d50ba49933869017.tar.xz drakx-39def6996941bb414d0d6ac9d50ba49933869017.zip | |
pass $o to getNextStep
| -rw-r--r-- | perl-install/install2.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 6bbfb514b..ed179a6ec 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -293,7 +293,7 @@ sub configureX { #------------------------------------------------------------------------------ sub exitInstall { my ($_clicked, $_xent_number, $auto) = @_; - installStepsCall($o, $auto, 'exitInstall', getNextStep() eq 'exitInstall'); + installStepsCall($o, $auto, 'exitInstall', getNextStep($::o) eq 'exitInstall'); } @@ -602,7 +602,7 @@ sub main { #-the main cycle my $clicked = 0; - MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep()) { + MAIN: for ($o->{step} = $o->{steps}{first};; $o->{step} = getNextStep($o)) { $o->{steps}{$o->{step}}{entered}++; $o->enteringStep($o->{step}); eval { diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index d3b9db89b..093b90be2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -192,8 +192,9 @@ sub clean_postinstall_rpms() { #-###################################################################################### #- Functions #-###################################################################################### -sub getNextStep() { - find { !$::o->{steps}{$_}{done} && $::o->{steps}{$_}{reachable} } @{$::o->{orderedSteps}} +sub getNextStep { + my ($o) = @_; + find { !$o->{steps}{$_}{done} && $o->{steps}{$_}{reachable} } @{$o->{orderedSteps}} } sub spawnShell() { |