From d81a1f6cb94f3558ec7850adb6a3a32dbdf950c9 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 30 Jan 2025 01:47:56 -0600 Subject: [PATCH] just name fixups. maybe more. this still doesn't work --- findNext.go | 8 ++------ prepareRelease.go | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/findNext.go b/findNext.go index f7e7927..3af3c6f 100644 --- a/findNext.go +++ b/findNext.go @@ -72,7 +72,7 @@ func findNext() bool { } log.Info("CHECKING:", check.GetGoPath()) // _, err := check.RunVerboseOnError([]string{"go-mod-clean", "--strict"}) - _, err := check.RunStrictNew([]string{"go-mod-clean", "--smart"}) + _, err := check.RunQuiet([]string{"go-mod-clean", "--smart"}) if err != nil { log.Info("FAILED: findNext() go-mod-clean --smart", check.GetGoPath(), err) continue @@ -116,7 +116,6 @@ func findNext() bool { if err := me.forge.FinalGoDepsCheckOk(check, argv.Verbose); err != nil { // if err := me.forge.FinalGoDepsCheckOk(check, false); err != nil { log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err) - log.Info("FinalGoDepsCheckOk() repo=", check.GetGoPath(), "err:", err) log.Info("CHECKING END:", check.GetGoPath()) log.Info("") continue @@ -138,14 +137,11 @@ func findNext() bool { // tries to fix the go.mod and go.sum files func fixGodeps(check *gitpb.Repo) bool { - log.Info("fixGoDeps() START", check.GetGoPath()) - log.Info("fixGoDeps() START", check.GetGoPath()) - log.Info("fixGoDeps() START", check.GetGoPath()) var good bool = true check.GoDeps = nil - if result, err := check.RunStrictNew([]string{"go-mod-clean", "--strict"}); err != nil { + if result, err := check.RunQuiet([]string{"go-mod-clean", "--strict"}); err != nil { // log.Info("fixGoDeps() runGoClean() strict failed", check.GetGoPath(), err) // log.Info("fixGoDeps() runGoClean() strict failed", check.GetGoPath(), len(result.Stdout), len(result.Stderr)) if len(result.Stderr) > 0 { diff --git a/prepareRelease.go b/prepareRelease.go index 78fdd34..8788439 100644 --- a/prepareRelease.go +++ b/prepareRelease.go @@ -51,7 +51,7 @@ func rillRestore(repo *gitpb.Repo) error { return nil } - _, err := repo.RunStrictNew([]string{"go-mod-clean", "--restore"}) + _, err := repo.RunQuiet([]string{"go-mod-clean", "--restore"}) rillcount += 1 if err != nil { log.Info("go-mod-clean --restore failed", repo.GetGoPath(), err)