| commit | cbfb07e97dbe6428a5e23f47d9a0e392024a2feb | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Fri Mar 21 21:12:25 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Fri Mar 21 21:12:25 2014 +0000 |
| tree | 4a671812ee11001671589a707fcf07535090f68d | |
| parent | 62f649dacbf662b33d611480c0bb2324a312c052 [diff] | |
| parent | a3935fb0ad9afd48e4ac6bd68f79d5fb83a0238d [diff] |
Merge "Skip child process kills in stack.sh exit trap"
diff --git a/stack.sh b/stack.sh index 6bf5bd7..23f11fe 100755 --- a/stack.sh +++ b/stack.sh
@@ -595,7 +595,9 @@ function exit_trap { local r=$? jobs=$(jobs -p) - if [[ -n $jobs ]]; then + # Only do the kill when we're logging through a process substitution, + # which currently is only to verbose logfile + if [[ -n $jobs && -n "$LOGFILE" && "$VERBOSE" == "True" ]]; then echo "exit_trap: cleaning up child processes" kill 2>&1 $jobs fi