From 996c60616a9e6252ac4ffbd5a69172537425de88 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Sat, 24 Nov 2018 21:37:54 +0800 Subject: [PATCH] fix: fix error info start capitalized Signed-off-by: zhangyue --- archive/tar.go | 2 +- contrib/seccomp/seccomp.go | 4 ++-- mount/mountinfo_linux.go | 8 ++++---- sys/oom_unix_test.go | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/archive/tar.go b/archive/tar.go index ac04e3e02382..1a61b413483b 100644 --- a/archive/tar.go +++ b/archive/tar.go @@ -295,7 +295,7 @@ func applyNaive(ctx context.Context, root string, tr *tar.Reader, options ApplyO linkBasename := filepath.Base(hdr.Linkname) srcHdr = aufsHardlinks[linkBasename] if srcHdr == nil { - return 0, fmt.Errorf("Invalid aufs hardlink") + return 0, fmt.Errorf("invalid aufs hardlink") } p, err := fs.RootPath(aufsTempdir, linkBasename) if err != nil { diff --git a/contrib/seccomp/seccomp.go b/contrib/seccomp/seccomp.go index 4619681f4592..275a4c3e6c74 100644 --- a/contrib/seccomp/seccomp.go +++ b/contrib/seccomp/seccomp.go @@ -37,10 +37,10 @@ func WithProfile(profile string) oci.SpecOpts { s.Linux.Seccomp = &specs.LinuxSeccomp{} f, err := ioutil.ReadFile(profile) if err != nil { - return fmt.Errorf("Cannot load seccomp profile %q: %v", profile, err) + return fmt.Errorf("cannot load seccomp profile %q: %v", profile, err) } if err := json.Unmarshal(f, s.Linux.Seccomp); err != nil { - return fmt.Errorf("Decoding seccomp profile failed %q: %v", profile, err) + return fmt.Errorf("decoding seccomp profile failed %q: %v", profile, err) } return nil } diff --git a/mount/mountinfo_linux.go b/mount/mountinfo_linux.go index a986f8f4ea5d..369d045d7df1 100644 --- a/mount/mountinfo_linux.go +++ b/mount/mountinfo_linux.go @@ -68,7 +68,7 @@ func parseInfoFile(r io.Reader) ([]Info, error) { numFields := len(fields) if numFields < 10 { // should be at least 10 fields - return nil, fmt.Errorf("Parsing '%s' failed: not enough fields (%d)", text, numFields) + return nil, fmt.Errorf("parsing '%s' failed: not enough fields (%d)", text, numFields) } p := Info{} // ignore any numbers parsing errors, as there should not be any @@ -76,7 +76,7 @@ func parseInfoFile(r io.Reader) ([]Info, error) { p.Parent, _ = strconv.Atoi(fields[1]) mm := strings.Split(fields[2], ":") if len(mm) != 2 { - return nil, fmt.Errorf("Parsing '%s' failed: unexpected minor:major pair %s", text, mm) + return nil, fmt.Errorf("parsing '%s' failed: unexpected minor:major pair %s", text, mm) } p.Major, _ = strconv.Atoi(mm[0]) p.Minor, _ = strconv.Atoi(mm[1]) @@ -101,11 +101,11 @@ func parseInfoFile(r io.Reader) ([]Info, error) { } } if i == numFields { - return nil, fmt.Errorf("Parsing '%s' failed: missing separator ('-')", text) + return nil, fmt.Errorf("parsing '%s' failed: missing separator ('-')", text) } // There should be 3 fields after the separator... if i+4 > numFields { - return nil, fmt.Errorf("Parsing '%s' failed: not enough fields after a separator", text) + return nil, fmt.Errorf("parsing '%s' failed: not enough fields after a separator", text) } // ... but in Linux <= 3.9 mounting a cifs with spaces in a share name // (like "//serv/My Documents") _may_ end up having a space in the last field diff --git a/sys/oom_unix_test.go b/sys/oom_unix_test.go index 7ccf57f126fa..0e97b7b15ed0 100644 --- a/sys/oom_unix_test.go +++ b/sys/oom_unix_test.go @@ -103,7 +103,7 @@ func waitForPid(process *os.Process) (int, error) { case pid := <-c: return pid, nil case <-time.After(10 * time.Second): - return 0, errors.New("Process did not start in 10 seconds") + return 0, errors.New("process did not start in 10 seconds") } }