diff options
| -rw-r--r-- | finalGoSumCheck.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/finalGoSumCheck.go b/finalGoSumCheck.go index dfdbf45..6fba0a3 100644 --- a/finalGoSumCheck.go +++ b/finalGoSumCheck.go @@ -5,6 +5,7 @@ import ( "fmt" "strings" + "go.wit.com/lib/ENV" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -18,7 +19,7 @@ import ( // it re-scans the go.sum file. DOES NOT MODIFY ANYTHING // this is the last thing to run to double check everything // before 'git tag' or git push --tags -func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo, verbose bool) error { +func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo) error { if check == nil { return errors.New("FinalGoDepsCheckOk() boo, check == nil") } @@ -51,12 +52,12 @@ func (f *Forge) FinalGoDepsCheckOk(check *gitpb.Repo, verbose bool) error { if depRepo.GetVersion() != found.GetTargetVersion() { check := f.FindByNamespace(depRepo.GetGoPath()) if f.Config.IsReadOnly(check.GetGoPath()) { - if verbose { + if ENV.Verbose() { log.Printf("%-48s ok error .%s. vs .%s. (ignoring read-only repo)\n", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) } } else { if f.CheckOverride(depRepo.GetGoPath()) { - if verbose { + if ENV.Verbose() { log.Printf("%-48s ok error .%s. vs .%s. (forge.CheckOverride())\n", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) } // skip this gopath because it's probably broken forever @@ -110,7 +111,7 @@ func (f *Forge) CheckOverride(gopath string) bool { return false } -func (f *Forge) TestGoDepsCheckOk(godeps *gitpb.GoDeps, verbose bool) error { +func (f *Forge) TestGoDepsCheckOk(godeps *gitpb.GoDeps) error { if godeps == nil { return errors.New("forge.TestGoDepsCheckOk() godeps == nil") } @@ -133,12 +134,12 @@ func (f *Forge) TestGoDepsCheckOk(godeps *gitpb.GoDeps, verbose bool) error { if depRepo.GetVersion() != found.GetTargetVersion() { check := f.FindByNamespace(depRepo.GetGoPath()) if f.Config.IsReadOnly(check.GetGoPath()) { - if verbose { + if ENV.Verbose() { log.Printf("%-48s ok error .%s. vs .%s. (ignoring read-only repo)\n", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) } } else { if f.CheckOverride(depRepo.GetGoPath()) { - if verbose { + if ENV.Verbose() { log.Printf("%-48s ok error .%s. vs .%s. (forge.CheckOverride())\n", depRepo.GetGoPath(), depRepo.GetVersion(), found.GetTargetVersion()) } // skip this gopath because it's probably broken forever |