Commit 9108966f by Mario Trangoni

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)
parent 68507e88
...@@ -22,13 +22,13 @@ var versionRe = regexp.MustCompile(`grafana-(.*)(\.|_)(arm64|armhfp|aarch64|armv ...@@ -22,13 +22,13 @@ var versionRe = regexp.MustCompile(`grafana-(.*)(\.|_)(arm64|armhfp|aarch64|armv
var debVersionRe = regexp.MustCompile(`grafana_(.*)_(arm64|armv7|armhf|amd64)\.deb`) var debVersionRe = regexp.MustCompile(`grafana_(.*)_(arm64|armv7|armhf|amd64)\.deb`)
var builds = []build{} var builds = []build{}
var architectureMapping = map[string]string{ var architectureMapping = map[string]string{
"armv7":"armv7", "armv7": "armv7",
"armhfp":"armv7", "armhfp": "armv7",
"armhf":"armv7", "armhf": "armv7",
"arm64":"arm64", "arm64": "arm64",
"aarch64":"arm64", "aarch64": "arm64",
"amd64":"amd64", "amd64": "amd64",
"x86_64":"amd64", "x86_64": "amd64",
} }
func main() { func main() {
...@@ -78,7 +78,7 @@ func mapPackage(path string, name string, shaBytes []byte) (build, error) { ...@@ -78,7 +78,7 @@ func mapPackage(path string, name string, shaBytes []byte) (build, error) {
if len(result) > 0 { if len(result) > 0 {
version = string(result[1]) version = string(result[1])
log.Printf("Version detected: %v", version) log.Printf("Version detected: %v", version)
} else if (len(debResult) > 0) { } else if len(debResult) > 0 {
version = string(debResult[1]) version = string(debResult[1])
} else { } else {
return build{}, fmt.Errorf("Unable to figure out version from '%v'", name) 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) { ...@@ -124,6 +124,9 @@ func mapPackage(path string, name string, shaBytes []byte) (build, error) {
} }
func packageWalker(path string, f os.FileInfo, err error) 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") { if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") || strings.Contains(f.Name(), "latest") {
return nil return nil
} }
...@@ -134,7 +137,6 @@ func packageWalker(path string, f os.FileInfo, err error) error { ...@@ -134,7 +137,6 @@ func packageWalker(path string, f os.FileInfo, err error) error {
} }
build, err := mapPackage(path, f.Name(), shaBytes) build, err := mapPackage(path, f.Name(), shaBytes)
if err != nil { if err != nil {
log.Printf("Could not map metadata from package: %v", err) log.Printf("Could not map metadata from package: %v", err)
return nil return nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment