From 9108966fcb40bd7fe974c4215f5b6feedc939fb7 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Mon, 15 Oct 2018 22:13:36 +0200 Subject: [PATCH] scripts/build/publish.go: Fix warning on err variable. See, $ gometalinter --vendor --deadline 10m --disable-all --enable=megacheck ./... scripts/build/publish.go:126:48:warning: argument err is overwritten before first use (SA4009) (megacheck) --- scripts/build/publish.go | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/build/publish.go b/scripts/build/publish.go index ab9cbebf6bb..d5b19877724 100644 --- a/scripts/build/publish.go +++ b/scripts/build/publish.go @@ -22,13 +22,13 @@ var versionRe = regexp.MustCompile(`grafana-(.*)(\.|_)(arm64|armhfp|aarch64|armv var debVersionRe = regexp.MustCompile(`grafana_(.*)_(arm64|armv7|armhf|amd64)\.deb`) var builds = []build{} var architectureMapping = map[string]string{ - "armv7":"armv7", - "armhfp":"armv7", - "armhf":"armv7", - "arm64":"arm64", - "aarch64":"arm64", - "amd64":"amd64", - "x86_64":"amd64", + "armv7": "armv7", + "armhfp": "armv7", + "armhf": "armv7", + "arm64": "arm64", + "aarch64": "arm64", + "amd64": "amd64", + "x86_64": "amd64", } func main() { @@ -78,7 +78,7 @@ func mapPackage(path string, name string, shaBytes []byte) (build, error) { if len(result) > 0 { version = string(result[1]) log.Printf("Version detected: %v", version) - } else if (len(debResult) > 0) { + } else if len(debResult) > 0 { version = string(debResult[1]) } else { return build{}, fmt.Errorf("Unable to figure out version from '%v'", name) @@ -124,6 +124,9 @@ func mapPackage(path string, name string, shaBytes []byte) (build, error) { } func packageWalker(path string, f os.FileInfo, err error) error { + if err != nil { + log.Printf("error: %v", err) + } if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") || strings.Contains(f.Name(), "latest") { return nil } @@ -134,7 +137,6 @@ func packageWalker(path string, f os.FileInfo, err error) error { } build, err := mapPackage(path, f.Name(), shaBytes) - if err != nil { log.Printf("Could not map metadata from package: %v", err) return nil