Fix buffer_output to actually handle interrupts

lavalamp · Jan 6, 2016 · ff0a287 · ff0a287
1 parent acef040
commit ff0a287
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh
@@ -401,12 +401,14 @@ function cluster::mesos::docker::buffer_output {
   local cmd="$@"
   local tempfile="$(mktemp "${TMPDIR:-/tmp}/buffer.XXXXXX")"
   trap "kill -TERM \${PID}; rm '${tempfile}'" TERM INT
+  set +e
   ${cmd} &> "${tempfile}" &
   PID=$!
   wait ${PID}
   trap - TERM INT
   wait ${PID}
   local exit_status="$?"
+  set -e
   if [ "${exit_status}" != 0 ]; then
     cat "${tempfile}" 1>&2
   fi