openstack/devstack
Code Issues Proposed changes

Move failure trap after functions it uses

Browse Source 
Move the failure trap after the functions it uses, so that
"delete_all" is defined when it is triggered.

Change-Id: Icb2465d0f834b8cb2d46dca3c7df4ae06e49d9b5
This commit is contained in:
Ian Wienand 2015-06-30 13:47:51 +10:00
parent e4d57d6bed
commit 04c0f0be26
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
exercises/neutron-adv-test.sh
View File

@ -19,18 +19,6 @@ echo "*********************************************************************"
set -o errtrace set -o errtrace
trap failed ERR
function failed {
local r=$?
set +o errtrace
set +o xtrace
echo "Failed to execute"
echo "Starting cleanup..."
delete_all
echo "Finished cleanup"
exit $r
}
# Print the commands being run so that we can see the command that triggers # Print the commands being run so that we can see the command that triggers
# an error. It is also useful for following allowing as the install occurs. # an error. It is also useful for following allowing as the install occurs.
set -o xtrace set -o xtrace
@ -441,6 +429,18 @@ function main {
fi fi
} }
trap failed ERR
function failed {
local r=$?
set +o errtrace
set +o xtrace
echo "Failed to execute"
echo "Starting cleanup..."
delete_all
echo "Finished cleanup"
exit $r
}
# Kick off script # Kick off script
# --------------- # ---------------