summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--main.go15
2 files changed, 12 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 0aa8a8f..a152305 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
VERSION = $(shell git describe --tags)
BUILDTIME = $(shell date +%Y.%m.%d_%H%M)
-run: goimports build
- ./go-clean --version
+run: goimports install
+ go-clean --version
vet:
@GO111MODULE=off go vet
diff --git a/main.go b/main.go
index 7fefbb8..c3a1d0d 100644
--- a/main.go
+++ b/main.go
@@ -69,14 +69,19 @@ func main() {
badExit(err)
}
+ // try to trim junk
+ if err := forge.TrimGoSum(check); err != nil {
+ badExit(err)
+ }
+
// check go.sum file
- if err := forge.CleanGoDepsCheckOk(check); err == nil {
- log.Info("forge.FinalGoDepsCheck() worked :", check.GoPath)
- okExit(check.GoPath + " go.sum seems clean")
- } else {
+ if err := forge.CleanGoDepsCheckOk(check); err != nil {
log.Info("forge.FinalGoDepsCheck() failed. boo. :", check.GoPath)
badExit(err)
}
+
+ log.Info("forge.FinalGoDepsCheck() worked :", check.GoPath)
+ okExit(check.GoPath + " go.sum seems clean")
}
func findPwdRepo() *gitpb.Repo {
@@ -104,6 +109,6 @@ func okExit(thing string) {
}
func badExit(err error) {
- log.Info("Finished go-clean with error", err, forge.GetGoSrc())
+ log.Info("go-clean failed: ", err, forge.GetGoSrc())
os.Exit(-1)
}