diff --git a/releaseWindow.go b/releaseWindow.go index b8f829c..97073a0 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -153,7 +153,6 @@ func createReleaseBox(box *gui.Node) { if doAll(release.current, all) { log.Info("EVERYTHING OK") - release.current.setGoSumStatus("RELEASED") gopath := release.current.String() cmd := []string{"go", "get", "-v", gopath + "@" + release.version.String()} @@ -169,6 +168,15 @@ func createReleaseBox(box *gui.Node) { if err == nil { log.Info("SELF UPDATE OK. out =", out) log.Info("SELF UPDATE WORKED") + release.current.setGoSumStatus("RELEASED") + + release.current.status.UpdateCurrent() + // repo.newScan() + cbname := release.current.status.GetCurrentBranchName() + cbversion := release.current.status.GetCurrentBranchVersion() + lasttag := release.current.status.GetLastTagVersion() + release.current.lastTag.SetLabel(lasttag) + release.current.vLabel.SetLabel(cbname + " " + cbversion) } else { log.Info("SELF UPDATE FAILED err =", err) log.Info("SELF UPDATE FAILED out =", out) @@ -283,7 +291,6 @@ func createReleaseBox(box *gui.Node) { release.status.SetValue("GOOD") release.notes.SetValue("CheckGoSum() does not seem to lie") } - // goodCheckGoSum() buttonEnable() }) @@ -326,9 +333,10 @@ func createReleaseBox(box *gui.Node) { buttonEnable() }) } + func goodCheckGoSum() bool { tmp := release.current.String() - log.Info("Run CheckGoSum on repo:", tmp) + log.Info("goodCheckGoSum() START on repo:", tmp, "STATUS =", release.current.getGoSumStatus()) /* */ @@ -354,6 +362,7 @@ func goodCheckGoSum() bool { } if maybe { log.Info("SUCCEEDED.", release.current.String()) + log.Info("SUCCEEDED. goSumStatus.String() =", release.current.goSumStatus.String()) log.Info("SUCCEEDED. MAYBE. try it again get go.sum requirements") return true } else { @@ -439,11 +448,16 @@ func scanForReady() bool { } func findNextDirty(onlyKind string) bool { - for _, repo := range me.allrepos { + for key := range me.allrepos { + repo := me.allrepos[key] goSumS := repo.getGoSumStatus() dirtyS := repo.dirtyLabel.String() log.Info("findNextDirty()", repo.String(), goSumS, dirtyS) + if repo.status.ReadOnly() { + log.Info("findNextDirty() skipping readonly") + continue + } if goSumS == "PRIMATIVE" { if setCurrentRepo(repo, "PRIMATIVE", "release new version") { if release.version.String() == release.current.status.GetLastTagVersion() { @@ -468,7 +482,11 @@ func findNextDirty(onlyKind string) bool { continue } setCurrentRepo(repo, "REDO GOSUM", "try redoing the gosum") + newgoSumS := release.current.getGoSumStatus() + newdirtyS := release.current.dirtyLabel.String() + newlastS := release.current.status.GetLastTagVersion() if goodCheckGoSum() { + log.Info("findNextDirty() returning true from goodCheckGoSum()", newgoSumS, newgoSumS, newdirtyS, newlastS) return true } else { // continue