diff options
| -rw-r--r-- | globalDisplayOptions.go | 2 | ||||
| -rw-r--r-- | releaseWindow.go | 30 |
2 files changed, 12 insertions, 20 deletions
diff --git a/globalDisplayOptions.go b/globalDisplayOptions.go index 8d8a6cc..1f6b149 100644 --- a/globalDisplayOptions.go +++ b/globalDisplayOptions.go @@ -52,6 +52,8 @@ func globalDisplayOptions(box *gui.Node) { group1.NewButton("Show Repository Window", func() { showHideRepos() + scanForReady() + scanForReady() reposwin.Toggle() }) diff --git a/releaseWindow.go b/releaseWindow.go index e60ed7c..d7f388e 100644 --- a/releaseWindow.go +++ b/releaseWindow.go @@ -74,7 +74,6 @@ func createReleaseBox(box *gui.Node) { release.grid.NewButton("scan for Ready", func() { me.Disable() scanForReady() - scanForReady() me.Enable() }) release.grid.NewButton("findNextDirty()", func() { @@ -319,31 +318,18 @@ func createReleaseBox(box *gui.Node) { }) - release.grid.NewButton("reset with scanGoSum()", func() { - buttonDisable() - // do an initial scan of all the repos - scanGoSum() - buttonEnable() - }) - release.makeRedomodB = release.grid.NewButton("make redomod", func() { - buttonDisable() - release.current.status.MakeRedomod() - buttonEnable() - }) - release.goGetB = release.grid.NewButton("go get -v -u .", func() { + release.grid.NewButton("goodCheckGoSum()", func() { buttonDisable() - err, output := release.current.status.RunCmd([]string{"go", "get", "-v", "-u", "."}) - log.Warn(output) - if err == nil { - log.Warn("go get worked. recheck go.sum") + if goodCheckGoSum() { + log.Info("goodCheckGoSum() GOOD") } else { - log.Warn("go get failed") + log.Info("goodCheckGoSum() FAILED") } buttonEnable() }) - release.goGetB = release.grid.NewButton("SetMainWorkingName(guimaster)", func() { + release.makeRedomodB = release.grid.NewButton("make redomod", func() { buttonDisable() - release.current.status.SetMainWorkingName("guimaster") + release.current.status.MakeRedomod() buttonEnable() }) } @@ -364,10 +350,14 @@ func goodCheckGoSum() bool { if goSumS == "WHITELIST" { continue } + if release.current.status.ReadOnly() { + continue + } lastS := repo.status.GetLastTagVersion() targetS := repo.targetVersion.String() log.Info(" repo deps:", depname, version, "vs", goSumS, lastS, targetS) if lastS != targetS { + log.Info(" repo deps: FALSE lastS != targetS", lastS, targetS) maybe = false } } else { |