From d1aa0c1507b10234b9d6f96f2adcf86f83cc9df8 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 4 Oct 2019 13:38:37 +0200 Subject: 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 --- src/qtmoduleupdater/module.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qtmoduleupdater/module.go b/src/qtmoduleupdater/module.go index 8f6aa4e6..cf89bc87 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) -- cgit v1.2.3