diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-23 06:32:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-23 06:32:41 -0400 |
| commit | 2df9bdc00948e24855f3da42e31a6d273861e380 (patch) | |
| tree | a2b25921510922eb921c24bc13fb95228d41e0b7 /cmd/podman | |
| parent | 31231ffd748d10048e6541b18fd863a66342c6c7 (diff) | |
| parent | 5b4af0584d1c66b4f8d3d721374541fb76b5b395 (diff) | |
| download | podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.gz podman-2df9bdc00948e24855f3da42e31a6d273861e380.tar.bz2 podman-2df9bdc00948e24855f3da42e31a6d273861e380.zip | |
Merge pull request #13973 from Luap99/linter-revive
replace golint with revive linter
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/images/list.go | 2 | ||||
| -rw-r--r-- | cmd/podman/images/load.go | 2 | ||||
| -rw-r--r-- | cmd/podman/validate/args.go | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go index 9bddf1cff..58fb3e919 100644 --- a/cmd/podman/images/list.go +++ b/cmd/podman/images/list.go @@ -225,7 +225,7 @@ func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) { h.ImageSummary = *e h.Repository, h.Tag, err = tokenRepoTag(tag) if err != nil { - return nil, errors.Wrapf(err, "error parsing repository tag %q:", tag) + return nil, errors.Wrapf(err, "error parsing repository tag: %q", tag) } if h.Tag == "<none>" { untagged = append(untagged, h) diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index 6f85fb7e7..dbb7c32fa 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -91,7 +91,7 @@ func load(cmd *cobra.Command, args []string) error { } } else { if term.IsTerminal(int(os.Stdin.Fd())) { - return errors.Errorf("cannot read from terminal. Use command-line redirection or the --input flag.") + return errors.Errorf("cannot read from terminal, use command-line redirection or the --input flag") } outFile, err := ioutil.TempFile(util.Tmpdir(), "podman") if err != nil { diff --git a/cmd/podman/validate/args.go b/cmd/podman/validate/args.go index 743ee1837..669456bd3 100644 --- a/cmd/podman/validate/args.go +++ b/cmd/podman/validate/args.go @@ -23,9 +23,9 @@ func SubCommandExists(cmd *cobra.Command, args []string) error { if len(args) > 0 { suggestions := cmd.SuggestionsFor(args[0]) if len(suggestions) == 0 { - return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0]) + return errors.Errorf("unrecognized command `%[1]s %[2]s`\nTry '%[1]s --help' for more information", cmd.CommandPath(), args[0]) } - return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information.", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t")) + return errors.Errorf("unrecognized command `%[1]s %[2]s`\n\nDid you mean this?\n\t%[3]s\n\nTry '%[1]s --help' for more information", cmd.CommandPath(), args[0], strings.Join(suggestions, "\n\t")) } cmd.Help() // nolint: errcheck return errors.Errorf("missing command '%[1]s COMMAND'", cmd.CommandPath()) |