openstack/devstack
Code Issues Proposed changes

Merge "Fix exit_trap() error if no child processes"

Browse Source
This commit is contained in:
Jenkins
2014-02-28 01:50:06 +00:00
committed by Gerrit Code Review
parent 5f9d3980fc 94b9e82039
commit 5caa58459d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
stack.sh
View File

@@ -591,8 +591,11 @@ fi
trap exit_trap EXIT trap exit_trap EXIT
function exit_trap { function exit_trap {
local r=$? local r=$?
echo "exit_trap called, cleaning up child processes" jobs=$(jobs -p)
kill 2>&1 $(jobs -p) if [[ -n $jobs ]]; then
echo "exit_trap: cleaning up child processes"
kill 2>&1 $jobs
fi
exit $r exit $r
} }