summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--config/node.go2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0e94470..3fbc19d 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,9 @@ lint:
@go list -f $(GO_LIST_GOFILES) ./... | while read f; do \
gofmt -e -d "$${f}" >> .lint-gofmt.diff; \
done
- @test ! -s .lint-gofmt.diff || (echo "gofmt found errors:"; cat .lint-gofmt.diff; exit 1)
+ @test -z "$(grep '[^[:blank:]]' .lint-gofmt.diff)" || (echo "gofmt found errors:"; cat .lint-gofmt.diff; exit 1)
golint -set_exit_status $(GO_PACKAGES)
- go tool vet -composites=false $(GO_PACKAGES)
+ go vet -composites=false $(GO_PACKAGES)
unit:
go test -ldflags "$(GO_LDFLAGS)" $(GO_PACKAGES)
diff --git a/config/node.go b/config/node.go
index 9256fce..2800e61 100644
--- a/config/node.go
+++ b/config/node.go
@@ -1,8 +1,8 @@
package config
import (
- "path"
"gerrit.wikimedia.org/r/blubber/build"
+ "path"
)
// NodeConfig holds configuration fields related to the Node environment and