vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #536 from kevinetc123/patch-2

Browse source 
simplify code & correct some typo mistakes
This commit is contained in:
Stephen Day 2017-02-24 13:27:41 -08:00 committed by GitHub
commit 8de7b6062c
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archive/tar_windows.go
View file

@ -10,7 +10,7 @@ import (
"github.com/docker/docker/pkg/system"
)
// canonicalTarNameForPath returns platform-specific filepath
// tarName returns platform-specific filepath
// to canonical posix-style path for tar archival. p is relative
// path.
func tarName(p string) (string, error) {

4
cmd/ctr/pprof.go
View file

@ -8,6 +8,8 @@ import (
"os"
"time"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@ -175,7 +177,7 @@ func httpGetRequest(client *http.Client, request string) (io.ReadCloser, error)
return nil, err
}
if resp.StatusCode != 200 {
return nil, fmt.Errorf("%s", resp.Status)
return nil, errors.Errorf("http get failed with status: %s", resp.Status)
}
return resp.Body, nil
}