Skip apply_gerrit rebase when there is a rebase failure

recipe_modules/bot_update/resources/bot_update.py

Index: recipe_modules/bot_update/resources/bot_update.py
diff --git a/recipe_modules/bot_update/resources/bot_update.py b/recipe_modules/bot_update/resources/bot_update.py
index 044f0838f266018a443ba0e1fbad58a19f3998c6..3c41332da5f18d2502dce57b7bd0b3b2926319e2 100755
--- a/recipe_modules/bot_update/resources/bot_update.py
+++ b/recipe_modules/bot_update/resources/bot_update.py
@@ -604,7 +604,11 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
       try:
         ok = False
         git('checkout', '-b', temp_branch_name, cwd=root)
-        git('rebase', base_rev, cwd=root)
+        try:
+          git('rebase', base_rev, cwd=root)
+        except SubprocessFailed:

[agable, 2016/09/12 21:00:16]

No, because this will catch the exception and then prevent us from hitting the
outer "except SubprocessFailed" on line 626. Either re-raise (messy), or find a
way to put this in that exception handler.

[rmistry, 2016/09/12 21:06:31]

Ah true. I have no idea how to put this in the other exception handler,
reraising will definitely work though.

[rmistry, 2016/09/12 21:12:39]

Put in a raise.

+          # Abort the rebase since there were failures.
+          git('rebase', '--abort', cwd=root)
 
         # Get off of the temporary branch since it can't be deleted otherwise.
         cur_rev = git('rev-parse', 'HEAD', cwd=root).strip()