diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-13 08:55:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-10-15 06:43:02 +0200 |
| commit | eeb7e79c9ac404e13891bc67d43c6d5c67e773b2 (patch) | |
| tree | 8da1c754cb4436274c81d459be036446000595bb | |
| parent | 5426d28b0114448930a004a7c8f7b2498005677d (diff) | |
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 <frederik.gladhorn@qt.io>
| -rw-r--r-- | src/qtmoduleupdater/moduleupdatebatch.go | 8 |
1 files changed, 1 insertions, 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 |