diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-26 10:32:04 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-29 11:53:00 +0200 |
| commit | 5771f0d454c030de3620a599f8f82c41791cb331 (patch) | |
| tree | ac93048c84a3f1da94710eca3594e85b9e8d8dc3 /src/qtmoduleupdater/qt5.go | |
| parent | 98afc8167a1a47d998bf2afe8a9e74042e036669 (diff) | |
Clean up manual stage handing
Separate pushing the change to Gerrit from approval and staging, as suggested by Aapo.
Change-Id: I6d4c8f620c3df4503005baaf9fb2b5fac45076e6
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/qtmoduleupdater/qt5.go')
| -rw-r--r-- | src/qtmoduleupdater/qt5.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/qtmoduleupdater/qt5.go b/src/qtmoduleupdater/qt5.go index 33efb052..1567878d 100644 --- a/src/qtmoduleupdater/qt5.go +++ b/src/qtmoduleupdater/qt5.go @@ -246,5 +246,13 @@ func prepareQt5Update(product string, branch string, updatedModules map[string]* fmt.Printf("Created new commit for submodule update: %s\n", commitOid) - return pushAndStageChange(product, branch, commitOid, "Updating all submodules with a new consistent set", pushUserName, manualStage) + if err = pushChange(product, branch, commitOid, "Updating all submodules with a new consistent set", pushUserName); err != nil { + return fmt.Errorf("Error pushing qt5 change: %s", err) + } + + if manualStage { + return nil + } + + return reviewAndStageChange(product, branch, commitOid, "Updating all submodules with a new consistent set", pushUserName) } |