diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-18 11:54:56 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-29 11:52:39 +0200 |
| commit | 5b258d946ca96b47f94a6cdc65afe3bf23151d6e (patch) | |
| tree | 5d32130a4b69ae2a1ff9c4a1492763b759e9706c | |
| parent | be52132dd5b59cec45eb93f09d20211df990596e (diff) | |
Avoid approval when passing -manual-stage
The operation might fail, which should not stop us from completing the
updates.
Change-Id: I86816929558c91d0e8953512936e5b4b0c51d65b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | src/qtmoduleupdater/gerrit.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qtmoduleupdater/gerrit.go b/src/qtmoduleupdater/gerrit.go index d3ef67f5..38101a6e 100644 --- a/src/qtmoduleupdater/gerrit.go +++ b/src/qtmoduleupdater/gerrit.go @@ -229,8 +229,10 @@ func pushAndStageChange(repoPath string, branch string, commitID OID, summary st if summary != "" { reviewArgs = append(reviewArgs, "-m", escapeGerritMessage(summary)) } - // Pass in sanity review, since the sanity bot runs only after a delay and thus the commit will get refused. - reviewArgs = append(reviewArgs, "--code-review", "2", "--sanity-review", "1") + if !manualStage { + // Pass in sanity review, since the sanity bot runs only after a delay and thus the commit will get refused. + reviewArgs = append(reviewArgs, "--code-review", "2", "--sanity-review", "1") + } updateCommand, err := gerritSSHCommand(*pushURL, reviewArgs...) if err != nil { |