commit f3388c0ec0fb52268601e08bdd5f5764960d3e63
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Apr 19 12:22:46 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 19 12:22:48 2013 +0000
tree e3a36c422c48e3891df2ff43674c1aec743defd3
parent 401c9380b35a84e93f3ba4794c5f7259e16a1041
parent 5a9fdc3f7772ab4c9f2fbe87137a879c0dcf77ad

Merge "TrivialRebase: Adapt to labels in 2.6" into stable-2.6

contrib/trivial_rebase.py

diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py
index 60057ce..b58be47 100755
--- a/contrib/trivial_rebase.py
+++ b/contrib/trivial_rebase.py
@@ -216,9 +216,9 @@
       # Note: Sites with different 'copy_min_score' values in the
       # approval_categories DB table might want different behavior here.
       # Additional categories should also be added if desired.
-      if approval["category_id"] == "CRVW" and approval['value'] != '-2':
+      if approval["category_id"] == "Code-Review" and approval['value'] != '-2':
         self.AppendAcctApproval(approval['account_id'], '--code-review %s' % approval['value'])
-      elif approval["category_id"] == "VRIF":
+      elif approval["category_id"] == "Verified":
         # Don't re-add verifies
         # self.AppendAcctApproval(approval['account_id'], '--verified %s' % approval['value'])
         continue