Merge "Turn off tracing around pid/chroot check"

2016-11-21 00:31:49 +00:00 · 2016-11-21 00:31:49 +00:00 · 09cab0fa65
commit 09cab0fa65
parent c5ec1348c3 e0c346d479
1 changed files with 6 additions and 0 deletions
--- a/lib/common-functions
+++ b/lib/common-functions
@ -135,6 +135,10 @@ function eval_run_d () {
 }

 function kill_chroot_processes () {
+    local xtrace
+    xtrace=$(set +o | grep xtrace)
+    set +o xtrace
+
    if [ -z "${1}" ]; then
        echo "ERROR: no chroot directory specified"
        exit 1
@ -149,6 +153,8 @@ function kill_chroot_processes () {
            sudo kill $pid
        fi
    done
+
+    $xtrace
 }

 function cleanup_build_dir () {