diff options
| author | Joseph Richey <joerichey@google.com> | 2019-08-29 08:59:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 08:59:18 -0700 |
| commit | 8a3acda2011e9a080ee792c1e11646e6118a4930 (patch) | |
| tree | a510fcc5419ea13b8c942241296071107c381c65 | |
| parent | b41569d397d3e66099cde07d8eef36b2f42dd0ec (diff) | |
| parent | c5661ed3034d912a22f642326cea859969daba4e (diff) | |
Merge pull request #142 from ebiggers/goimports
Fix 'make format'-related CI failure
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | filesystem/mountpoint.go | 19 |
2 files changed, 10 insertions, 12 deletions
@@ -75,6 +75,7 @@ override GO_FLAGS += --ldflags '$(GO_LINK_FLAGS)' ###### Find All Files and Directories ###### FILES := $(shell find . \( -path ./vendor -o -path "./.*" \) -prune -o -type f -printf "%P\n") GO_FILES := $(filter %.go,$(FILES)) +GO_NONGEN_FILES := $(filter-out %.pb.go,$(GO_FILES)) GO_DIRS := $(sort $(dir $(GO_FILES))) C_FILES := $(filter %.c %.h,$(FILES)) PROTO_FILES := $(filter %.proto,$(FILES)) @@ -95,7 +96,7 @@ gen: $(BIN)/protoc $(BIN)/protoc-gen-go $(PROTO_FILES) protoc --go_out=. $(PROTO_FILES) format: $(BIN)/goimports - goimports -w $(GO_DIRS) + goimports -w $(GO_NONGEN_FILES) clang-format -i -style=Google $(C_FILES) lint: $(BIN)/golint $(BIN)/staticcheck $(BIN)/misspell diff --git a/filesystem/mountpoint.go b/filesystem/mountpoint.go index 991a573..7ef91ce 100644 --- a/filesystem/mountpoint.go +++ b/filesystem/mountpoint.go @@ -22,8 +22,16 @@ package filesystem import ( + "fmt" "io/ioutil" + "log" "os" + "path/filepath" + "sort" + "strings" + "sync" + + "github.com/pkg/errors" ) /* @@ -35,17 +43,6 @@ const char* read_mode = "r"; */ import "C" -import ( - "fmt" - "log" - "path/filepath" - "sort" - "strings" - "sync" - - "github.com/pkg/errors" -) - var ( // These maps hold data about the state of the system's mountpoints. mountsByPath map[string]*Mount |