commit 7fbf2d4de762cda7fe7c0af48f509404213b85bf
author David James <davidjames@chromium.org> Sat Jul 14 18:23:49 2012 -0700
committer Gerrit <chrome-bot@google.com> Tue Jul 17 09:49:59 2012 -0700
tree e6c2fbcf56ee053c15440e6bdec018e5332c5b7f
parent ff7b09ac7a091c02d4a484a14c73e463c9cac772

Don't re-raise StepFailure exceptions in cbuildbot main script.

StepFailure exceptions are already recorded in the report and in the
stage that failed, so there is no need to print them again.

BUG=chromium-os:32596
TEST=Run cbuildbot and verify tracebacks are still printed out, but
     not quite as many times.

Change-Id: Id1c5c537de1151d3f26ff28f50306b3cbd7a45de
Reviewed-on: https://gerrit.chromium.org/gerrit/27460
Commit-Ready: David James <davidjames@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 913702e..28aa472 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -330,6 +330,12 @@
         success = self._ReExecuteInBuildroot(sync_instance)
       else:
         self.RunStages()
+    except results_lib.StepFailure:
+      # StepFailure exceptions are already recorded in the report, so there
+      # is no need to print these tracebacks twice.
+      exception_thrown = True
+      if not print_report:
+        raise
     except Exception:
       exception_thrown = True
       raise