diff options
author | Dave Borowitz <dborowitz@google.com> | 2013-07-29 16:12:22 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-29 16:12:22 +0000 |
commit | ccfd682f38494a95fb045a949928ca6ea64e2065 (patch) | |
tree | 3884d9b3e3f02b1dfe8d3fa86e59534d997cb804 | |
parent | 8e615b7c57cb32b37fb7dcdf36353c4011a15fc9 (diff) | |
parent | 02b672eea363767520b3267e1e84afec7cce95a1 (diff) |
Merge "TrivialRebase: Avoid re-adding -2 for code-review label" into stable-2.7
-rwxr-xr-x | contrib/trivial_rebase.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py index 538a7e02ac..b5c70c3867 100755 --- a/contrib/trivial_rebase.py +++ b/contrib/trivial_rebase.py @@ -221,8 +221,10 @@ class TrivialRebase: # 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"] == "Code-Review" and approval['value'] != '-2': - self.AppendAcctApproval(approval['account_id'], '--label Code-Review=%s' % approval['value']) + if approval["category_id"] == "Code-Review": + if approval['value'] != '-2': + self.AppendAcctApproval(approval['account_id'], + '--label Code-Review=%s' % approval['value']) elif approval["category_id"] == "Verified": # Don't re-add verifies # self.AppendAcctApproval(approval['account_id'], '--label Verified=%s' % approval['value']) |