diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-06 10:15:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-06 10:15:04 +0200 |
commit | 80a2317ca20b0e5e1cd064a8962beed642be3a36 (patch) | |
tree | 0730915a611542bf028d5b9c66ace1390a6c036f /cmd/podman | |
parent | f584d47a9d0c050c3b39793a73b0aba17b45e8ba (diff) | |
parent | d4aa89bb40b3a2c1730c9bff31a681007a3feb97 (diff) | |
download | podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.gz podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.tar.bz2 podman-80a2317ca20b0e5e1cd064a8962beed642be3a36.zip |
Merge pull request #7929 from kolyshkin/nits-err
Nits
Diffstat (limited to 'cmd/podman')
-rw-r--r-- | cmd/podman/images/build.go | 2 | ||||
-rw-r--r-- | cmd/podman/images/history.go | 2 | ||||
-rw-r--r-- | cmd/podman/system/connection/add.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go index d24bb18b6..ac1b2c848 100644 --- a/cmd/podman/images/build.go +++ b/cmd/podman/images/build.go @@ -210,7 +210,7 @@ func build(cmd *cobra.Command, args []string) error { if cmd.Flag("logfile").Changed { logfile, err := os.OpenFile(buildOpts.Logfile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0600) if err != nil { - return errors.Errorf("error opening logfile %q: %v", buildOpts.Logfile, err) + return err } defer logfile.Close() } diff --git a/cmd/podman/images/history.go b/cmd/podman/images/history.go index f3a41f6b9..30abf0ada 100644 --- a/cmd/podman/images/history.go +++ b/cmd/podman/images/history.go @@ -132,7 +132,7 @@ func history(cmd *cobra.Command, args []string) error { w := tabwriter.NewWriter(os.Stdout, 8, 2, 2, ' ', 0) err = tmpl.Execute(w, hr) if err != nil { - fmt.Fprintln(os.Stderr, errors.Wrapf(err, "Failed to print report")) + fmt.Fprintln(os.Stderr, errors.Wrapf(err, "failed to print report")) } w.Flush() return nil diff --git a/cmd/podman/system/connection/add.go b/cmd/podman/system/connection/add.go index 8b9ab6dbb..df036af1a 100644 --- a/cmd/podman/system/connection/add.go +++ b/cmd/podman/system/connection/add.go @@ -166,7 +166,7 @@ func getUDS(cmd *cobra.Command, uri *url.URL) (string, error) { value := cmd.Flag("identity").Value.String() auth, err := terminal.PublicKey(value, []byte(passwd)) if err != nil { - return "", errors.Wrapf(err, "Failed to read identity %q", value) + return "", errors.Wrapf(err, "failed to read identity %q", value) } authMethods = append(authMethods, auth) } |