From 0fc1ee04bd7191e8f18853802d268e3dc3d04686 Mon Sep 17 00:00:00 2001
From: Brandon Perkins <bperkins@redhat.com>
Date: Tue, 25 Jan 2022 15:34:12 -0500
Subject: [PATCH] Fixes for possible formatting directive and extra newline
errors in tests.
---
cmd/go-bindata/main.go | 2 +-
release_template.go | 8 ++++----
template.go | 4 ++--
v4/release_template.go | 8 ++++----
v4/template.go | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/cmd/go-bindata/main.go b/cmd/go-bindata/main.go
index d7e587f..bb23029 100644
--- a/cmd/go-bindata/main.go
+++ b/cmd/go-bindata/main.go
@@ -76,7 +76,7 @@ func main() {
}
func usage() {
- lerr.Println("Usage: " + appName + " [options] <input directories>\n")
+ lerr.Printf("Usage: " + appName + " [options] <input directories>\n\n")
flag.PrintDefaults()
}
diff --git a/release_template.go b/release_template.go
index 351d635..2103411 100644
--- a/release_template.go
+++ b/release_template.go
@@ -28,7 +28,7 @@ import (
func bindataRead(data, name string) ([]byte, error) {
gz, err := gzip.NewReader(strings.NewReader(data))
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
var buf bytes.Buffer
@@ -36,7 +36,7 @@ func bindataRead(data, name string) ([]byte, error) {
clErr := gz.Close()
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
if clErr != nil {
return nil, err
@@ -63,7 +63,7 @@ import (
func bindataRead(data []byte, name string) ([]byte, error) {
gz, err := gzip.NewReader(bytes.NewBuffer(data))
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
var buf bytes.Buffer
@@ -71,7 +71,7 @@ func bindataRead(data []byte, name string) ([]byte, error) {
clErr := gz.Close()
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
if clErr != nil {
return nil, err
diff --git a/template.go b/template.go
index 567b78b..2395263 100644
--- a/template.go
+++ b/template.go
@@ -73,7 +73,7 @@ func Asset(name string) ([]byte, error) {
if f, ok := _bindata[cannonicalName]; ok {
a, err := f()
if err != nil {
- return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+ return nil, fmt.Errorf("Asset", name, "can't read by error:", err)
}
return a.bytes, nil
}
@@ -103,7 +103,7 @@ func AssetInfo(name string) (os.FileInfo, error) {
if f, ok := _bindata[cannonicalName]; ok {
a, err := f()
if err != nil {
- return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+ return nil, fmt.Errorf("AssetInfo", name, "can't read by error:", err)
}
return a.info, nil
}
diff --git a/v4/release_template.go b/v4/release_template.go
index 351d635..2103411 100644
--- a/v4/release_template.go
+++ b/v4/release_template.go
@@ -28,7 +28,7 @@ import (
func bindataRead(data, name string) ([]byte, error) {
gz, err := gzip.NewReader(strings.NewReader(data))
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
var buf bytes.Buffer
@@ -36,7 +36,7 @@ func bindataRead(data, name string) ([]byte, error) {
clErr := gz.Close()
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
if clErr != nil {
return nil, err
@@ -63,7 +63,7 @@ import (
func bindataRead(data []byte, name string) ([]byte, error) {
gz, err := gzip.NewReader(bytes.NewBuffer(data))
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
var buf bytes.Buffer
@@ -71,7 +71,7 @@ func bindataRead(data []byte, name string) ([]byte, error) {
clErr := gz.Close()
if err != nil {
- return nil, fmt.Errorf("Read %q: %v", name, err)
+ return nil, fmt.Errorf("Read", name, ":", err)
}
if clErr != nil {
return nil, err
diff --git a/v4/template.go b/v4/template.go
index 567b78b..2395263 100644
--- a/v4/template.go
+++ b/v4/template.go
@@ -73,7 +73,7 @@ func Asset(name string) ([]byte, error) {
if f, ok := _bindata[cannonicalName]; ok {
a, err := f()
if err != nil {
- return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
+ return nil, fmt.Errorf("Asset", name, "can't read by error:", err)
}
return a.bytes, nil
}
@@ -103,7 +103,7 @@ func AssetInfo(name string) (os.FileInfo, error) {
if f, ok := _bindata[cannonicalName]; ok {
a, err := f()
if err != nil {
- return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
+ return nil, fmt.Errorf("AssetInfo", name, "can't read by error:", err)
}
return a.info, nil
}
--
2.34.1