summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-10-04 13:38:37 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-10-04 16:48:59 +0200
commitd1aa0c1507b10234b9d6f96f2adcf86f83cc9df8 (patch)
tree7fabf79a2bc08d0b1c4304364acf672dd6741409 /src
parent3656ea46e94b7825b4ab2188c38fbf422b243bf9 (diff)
downloadqtqa-d1aa0c1507b10234b9d6f96f2adcf86f83cc9df8.tar.gz
Fix re-running the bot when dependencies were changed manually
It may happen that a dependencies update was merged by hand, in which case the script should catch up with reality and see that the update isn't necessary. This happens automatically when the yaml file in the repo is identical with what the bot proposes. That however in turn requires us to make sure that we're up-to-date, so refresh the module tip before doing so. Change-Id: I352eba235440ab0ed38bafa9f07b07be8aed0472 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/qtmoduleupdater/module.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qtmoduleupdater/module.go b/src/qtmoduleupdater/module.go
index 8f6aa4e..cf89bc8 100644
--- a/src/qtmoduleupdater/module.go
+++ b/src/qtmoduleupdater/module.go
@@ -390,6 +390,8 @@ func (module *Module) updateDependenciesForModule(availableModules map[string]*M
}
defer index.Free()
+ module.refreshTip()
+
err = index.ReadTree(module.Tip)
if err != nil {
return dependenciesUpdateResult{}, fmt.Errorf("Error populating temporary index from tree: %s", err)