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..fedccb67f79c2b97240c2a1ba04a3ebed1c2da58 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)
+        finally:
+          # Skip the rebase since there were failures.
+          git('rebase', '--skip', cwd=root)

[agable, 2016/09/12 16:25:11]

I would use --abort instead of --skip; in this case they have the same result
(getting the repo out of the "rebase in progress" state), but --abort is clearer
to the reader that we're abandoning the rebase operation entirely rather than
trying to keep rebasing everything except for the failed file(s).

[rmistry, 2016/09/12 17:55:28]

Makes sense. Done.

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