diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-25 13:29:43 +0200 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2009-07-25 13:29:43 +0200 |
| commit | 14fc7d28f64debe5e466c94df83878243df29f9c (patch) | |
| tree | 4c20375485c1f4df29a1c5b7f3c60e419db4140f /src/core/libs/lib-flowcontrol.sh | |
| parent | a3dff558013e516ccddbfddc47adbbfddd8e7e82 (diff) | |
make the $ret variable local everywhere
Diffstat (limited to 'src/core/libs/lib-flowcontrol.sh')
| -rwxr-xr-x | src/core/libs/lib-flowcontrol.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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-) |