commit c3a81f99020dd6ffd637f40562a9840b8dadf840
author Michael Mortensen <mmortensen@google.com> Mon Jul 06 14:28:57 2020 -0600
committer Mike Frysinger <vapier@chromium.org> Wed Jul 08 08:26:10 2020 +0000
tree 8193f8593a74fbd13c8e2dfd157f6eccd8c88a28
parent 22fb697b9b0d557a8f8350fe9b579630fe966468

scripts/cros_sdk.py: Use cros_build_lib.Die rather than rethrow exception.

Calling cros_build_lib.Die (instead of rethrowing) causes the enclosing program
(including build_api) to output dozens of lines of stack trace as if
this was an unexpected condition, rather than a known case that we caught and
are exiting on.

BUG=chromium:1095661
TEST=manual, run_tests

Change-Id: I531bd87f81f629cd5f6483dd3a4883eb17894276
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2283859
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Michael Mortensen <mmortensen@google.com>

scripts/cros_sdk.py

diff --git a/scripts/cros_sdk.py b/scripts/cros_sdk.py
index b2ef8c2..97fe3a9 100644
--- a/scripts/cros_sdk.py
+++ b/scripts/cros_sdk.py
@@ -985,8 +985,7 @@
         except timeout_util.TimeoutError as e:
           logging.error('Acquiring write_lock on %s failed: %s', lock_path, e)
           if not options.force:
-            logging.error('Exiting; use --force to continue w/o lock.')
-            raise e
+            cros_build_lib.Die('Exiting; use --force to continue w/o lock.')
         if missing_image_tools:
           logging.notice('Unmounting chroot.')
           osutils.UmountTree(options.chroot)