| commit | 5caa58459d40933eb22d4546ced5a648d2eece36 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Feb 28 01:50:06 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Feb 28 01:50:06 2014 +0000 |
| tree | 17613419ceb1937b7821c37604354e9b956dd701 | |
| parent | 5f9d3980fc48272a8a7f095eba995ececad5c5d1 [diff] | |
| parent | 94b9e8203919e206be7bc68abda4ba898d2fcc80 [diff] |
Merge "Fix exit_trap() error if no child processes"
diff --git a/stack.sh b/stack.sh index c077074..ac23db0 100755 --- a/stack.sh +++ b/stack.sh
@@ -591,8 +591,11 @@ trap exit_trap EXIT function exit_trap { local r=$? - echo "exit_trap called, cleaning up child processes" - kill 2>&1 $(jobs -p) + jobs=$(jobs -p) + if [[ -n $jobs ]]; then + echo "exit_trap: cleaning up child processes" + kill 2>&1 $jobs + fi exit $r }