TrivialRebase: Call gerrit review instead of approve

approve is deprecated

Change-Id: I7653213ba0f9835cf6cfb7639cfeeb37b20e10f4

1 files changed, 5 insertions, 5 deletions

diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py
index 60057ce470..5d6a042793 100755
--- a/contrib/trivial_rebase.py
+++ b/contrib/trivial_rebase.py
@@ -204,7 +204,7 @@ class TrivialRebase:
       comment_msg = ("\'--message=New patchset patch-id matches previous patchset"
                      ", but commit message has changed.'")
       comment_cmd = [self.ssh, self.ssh_port_flag, self.port, self.server, 'gerrit',
-                     'approve', '--project', self.project, comment_msg, self.commit]
+                     'review', '--project', self.project, comment_msg, self.commit]
       self.CheckCall(comment_cmd)
       return
 
@@ -229,13 +229,13 @@ class TrivialRebase:
         print "Unsupported category: %s" % approval
         continue
 
-    gerrit_approve_msg = ("\'Automatically re-added by Gerrit trivial rebase "
+    gerrit_review_msg = ("\'Automatically re-added by Gerrit trivial rebase "
                           "detection script.\'")
     for acct, flags in self.acct_approvals.items():
-      gerrit_approve_cmd = ['gerrit', 'approve', '--project', self.project,
-                            '--message', gerrit_approve_msg, flags, self.commit]
+      gerrit_review_cmd = ['gerrit', 'review', '--project', self.project,
+                            '--message', gerrit_review_msg, flags, self.commit]
       email_addr = self.GetEmailFromAcctId(acct)
-      self.SuExec(email_addr, ' '.join(gerrit_approve_cmd))
+      self.SuExec(email_addr, ' '.join(gerrit_review_cmd))
 
 if __name__ == "__main__":
   try: