base_image_util.sh: less debug output.
Add set +x at the end of the function....
BUG=chromium:1016021, chromium:1011891
TEST=unittests pass
Change-Id: Ic08396ac814760d12a5f52a3f67562c0924ec99d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosutils/+/1872374
Tested-by: LaMont Jones <lamontjones@chromium.org>
Auto-Submit: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>
diff --git a/build_library/base_image_util.sh b/build_library/base_image_util.sh
index e222d05..14c2a45 100755
--- a/build_library/base_image_util.sh
+++ b/build_library/base_image_util.sh
@@ -183,6 +183,7 @@
local image_type="usb"
info "Entering create_base_image $*"
+ # TODO(crbug/1011891): remove this
set -x
if [[ "${FLAGS_disk_layout}" != "default" ]]; then
@@ -501,4 +502,6 @@
${SCRIPTS_DIR}/bin/cros_make_image_bootable "${BUILD_DIR}" \
${image_name} ${USE_DEV_KEYS} --adjust_part="${FLAGS_adjust_part}"
fi
+ # TODO(crbug/1011891): remove this.
+ set +x
}
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index 3a49963..ac861c6 100755
--- a/mount_gpt_image.sh
+++ b/mount_gpt_image.sh
@@ -1,8 +1,5 @@
#!/bin/bash
-echo "Entering $0 $*" >&2
-set -x
-
# Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -11,6 +8,10 @@
# and creates mount points for /var and /usr/local (if in dev_mode).
# Helper scripts should be run from the same location as this script.
+echo "Entering $0 $*" >&2
+# TODO(crbug/1011891): remove this
+set -x
+
SCRIPT_ROOT=$(dirname "$(readlink -f "$0")")
. "${SCRIPT_ROOT}/common.sh" || exit 1
. "${SCRIPT_ROOT}/build_library/filesystem_util.sh" || exit 1
