diff options
| -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 4728499378..37d894d925 100755 --- a/contrib/trivial_rebase.py +++ b/contrib/trivial_rebase.py @@ -148,8 +148,10 @@ class TrivialRebase: return patch_id_process.communicate()[0] def SuExec(self, as_user, cmd): - suexec_cmd = ['ssh', '-l', "Gerrit Code Review", '-p', self.port, self.server, '-i', - self.private_key_path, 'suexec', '--as', as_user, '--', cmd] + suexec_cmd = ['ssh', '-l', "Gerrit Code Review", '-p', self.port, self.server] + if self.private_key_path: + suexec_cmd += ['-i', self.private_key_path] + suexec_cmd += ['suexec', '--as', as_user, '--', cmd] self.CheckCall(suexec_cmd) def DiffCommitMessages(self, prev_commit): |