openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Turn off tracing around pid/chroot check"

Browse Source
This commit is contained in:
Jenkins
2016-11-21 00:31:49 +00:00
committed by Gerrit Code Review
parent c5ec1348c3 e0c346d479
commit 09cab0fa65
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/common-functions
View File

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