commit 684d36eea4096e82c26e93dcf2ee93295dbe3e92
author Mike Frysinger <vapier@chromium.org> Wed Jun 03 05:03:34 2015 -0400
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Fri Jun 05 19:35:04 2015 +0000
tree 6afe937a7259a804c2cdae1aa14a4651afe3db11
parent 7f96d9f336d1cc8403c63ef73ff1401e4ad2b190

cli: standardize --debug/exception display

Each tool implements this slightly different (if at all).  Pull it back
out and into the main runner so we get standard behvaior for all tools.

BUG=None
TEST=`cros flash ...` shows short error message
TEST=`cros --debug flash ...` shows full traceback
TEST=`./cbuildbot/run_tests` passes
CQ-DEPEND=CL:275395

Change-Id: Icbdc23a63dccbd8afee02bb48ef80f16323f5073
Reviewed-on: https://chromium-review.googlesource.com/274895
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/cros.py

diff --git a/scripts/cros.py b/scripts/cros.py
index ff11c1f..0fd5e45 100644
--- a/scripts/cros.py
+++ b/scripts/cros.py
@@ -72,7 +72,21 @@
                      subcommand.upload_stats_timeout])
       # TODO: to make command completion faster, send an interrupt signal to the
       # stats uploader task after the subcommand completes.
-      code = _RunSubCommand(subcommand)
+      try:
+        code = _RunSubCommand(subcommand)
+      except (commandline.ChrootRequiredError, commandline.ExecRequiredError):
+        # The higher levels want these passed back, so oblige.
+        raise
+      except Exception as e:
+        code = 1
+        logging.error('%s %s failed before completing.',
+                      command.GetToolset(),
+                      subcommand.command_name)
+        if namespace.debug:
+          raise
+        else:
+          logging.error(e)
+
       if code is not None:
         return code