commit c85d816f2731c5ed0445026b042d4f9e2e40244d
author Mike Frysinger <vapier@chromium.org> Sat Feb 08 00:45:21 2014 -0500
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Feb 11 05:32:49 2014 +0000
tree b67ea782591b8f422f11a8e92bb855d6517ce456
parent 6526cc94e2a1ffafe49afdebddf4aace783ba744

gerrit: catch GoB exceptions and present a pretty message

Rather than dumping the traceback when we get a GoB exception, catch it
and show the existing pretty die message.  If people want to debug the
issue further, they can use --debug.

BUG=chromium:327217
TEST=`gerrit inspect 24624` w/empty .netrc no longer shows traceback

Change-Id: I90a8ec760a67fd799beb9e3d37de398f5fc3d849
Reviewed-on: https://chromium-review.googlesource.com/185592
Reviewed-by: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>

scripts/gerrit.py

diff --git a/scripts/gerrit.py b/scripts/gerrit.py
index 5a9bce9..70829ab 100644
--- a/scripts/gerrit.py
+++ b/scripts/gerrit.py
@@ -20,6 +20,7 @@
 from chromite.lib import commandline
 from chromite.lib import cros_build_lib
 from chromite.lib import gerrit
+from chromite.lib import gob_util
 from chromite.lib import terminal
 
 
@@ -343,7 +344,8 @@
                    (cmd, len(argspec.args) - 1))
     try:
       functor(opts, *args)
-    except (cros_build_lib.RunCommandError, gerrit.GerritException) as e:
+    except (cros_build_lib.RunCommandError, gerrit.GerritException,
+            gob_util.GOBError) as e:
       cros_build_lib.Die(e.message)
   else:
     parser.error('unknown action: %s' % (cmd,))