From 14fc7d28f64debe5e466c94df83878243df29f9c Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Sat, 25 Jul 2009 13:29:43 +0200
Subject: make the $ret variable local everywhere

---
 src/core/libs/lib-flowcontrol.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/core/libs/lib-flowcontrol.sh')

diff --git a/src/core/libs/lib-flowcontrol.sh b/src/core/libs/lib-flowcontrol.sh
index 64e7f2b..078a33d 100755
--- a/src/core/libs/lib-flowcontrol.sh
+++ b/src/core/libs/lib-flowcontrol.sh
@@ -100,7 +100,7 @@ execute ()
 		then
 			shift 2
 			$object "$@"
-			ret=$?
+			local ret=$?
 			exit_var=exit_$object
 			read $exit_var <<< $ret # maintain exit status of each worker
 		else
@@ -128,7 +128,7 @@ execute ()
 			debug 'MAIN' "Loop iteration.  \$worker_str: $worker_str"
 			execute worker $worker_str || read $exit_var <<< $? # assign last failing exit code to exit_phase_<phasename>, if any.
 		done
-		ret=${!exit_var}
+		local ret=${!exit_var}
 	fi
 
 	debug 'MAIN' "Execute(): $object exit state was $ret"
@@ -183,7 +183,7 @@ show_report () #TODO: abstract UI method (cli/dia)
 	do
 		object=phase_$phase
 		exit_var=exit_$object
-		ret=${!exit_var}
+		local ret=${!exit_var}
 		echo -n "Phase $phase: "
 		[ "$ret" = "0" ] && echo "Success" || echo "Failed"
 		eval phase_array=$(declare | grep -e "^${object}=" | cut -d"=" -f 2-)
-- 
cgit v1.2.3-54-g00ecf