From 39def6996941bb414d0d6ac9d50ba49933869017 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 15 Oct 2003 14:35:58 +0000
Subject: pass $o to getNextStep

---
 perl-install/install2.pm    | 4 ++--
 perl-install/install_any.pm | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'perl-install')

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() {
-- 
cgit v1.2.1