From eeb7e79c9ac404e13891bc67d43c6d5c67e773b2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 13 Oct 2019 08:55:29 +0200 Subject: Fix updating qtrepotools/qtqa in qt5 updates Instead of ignoring these, add them to the "done" list right away. That way they show up in the list of modules to update in qt5.git. Change-Id: I31f02bd263d591589f6434d760f28fb73584e7bd Reviewed-by: Frederik Gladhorn --- src/qtmoduleupdater/moduleupdatebatch.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qtmoduleupdater/moduleupdatebatch.go b/src/qtmoduleupdater/moduleupdatebatch.go index d8a7205a..029b9601 100644 --- a/src/qtmoduleupdater/moduleupdatebatch.go +++ b/src/qtmoduleupdater/moduleupdatebatch.go @@ -144,18 +144,12 @@ func loadTodoAndDoneModuleMapFromSubModules(branch string, submodules map[string doneModules := make(map[string]*Module) for name, submodule := range submodules { - // Erase modules that don't follow the qt5 branching scheme and don't need - // dependencies.yaml - if submodule.branch == "master" { - continue - } - module, err := NewModule(name, branch, submodules) if err != nil { return nil, nil, fmt.Errorf("could not create internal module structure: %s", err) } - if submodule.repoType == "inherited" || name == "qt/qtbase" { + if submodule.repoType == "inherited" || name == "qt/qtbase" || submodule.branch != branch { doneModules[module.RepoPath] = module } else { todoModules[module.RepoPath] = module -- cgit v1.2.3