diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-17 18:45:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 18:45:36 +0100 |
| commit | 12de330094fdcd2e2fd0d10d5e5ddd962193de8b (patch) | |
| tree | fb249f58fde42bc575825b32474f09c111553603 /cmd/podman/pods | |
| parent | 42ec4cf87f8d0a84301594a4fc5cf05f0a10bd7f (diff) | |
| parent | 389dcb5c29d926e89d5d4c0b26ebf434c2fe5dcb (diff) | |
| download | podman-12de330094fdcd2e2fd0d10d5e5ddd962193de8b.tar.gz podman-12de330094fdcd2e2fd0d10d5e5ddd962193de8b.tar.bz2 podman-12de330094fdcd2e2fd0d10d5e5ddd962193de8b.zip | |
Merge pull request #8370 from rhatdan/wrap
Remove some more excessive wrapping and stuttering
Diffstat (limited to 'cmd/podman/pods')
| -rw-r--r-- | cmd/podman/pods/create.go | 2 | ||||
| -rw-r--r-- | cmd/podman/pods/prune.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go index d33455e81..449d60bb9 100644 --- a/cmd/podman/pods/create.go +++ b/cmd/podman/pods/create.go @@ -218,7 +218,7 @@ func create(cmd *cobra.Command, args []string) error { } if len(podIDFile) > 0 { if err = ioutil.WriteFile(podIDFile, []byte(response.Id), 0644); err != nil { - return errors.Wrapf(err, "failed to write pod ID to file %q", podIDFile) + return errors.Wrapf(err, "failed to write pod ID to file") } } fmt.Println(response.Id) diff --git a/cmd/podman/pods/prune.go b/cmd/podman/pods/prune.go index 626ef2895..444b0f5e0 100644 --- a/cmd/podman/pods/prune.go +++ b/cmd/podman/pods/prune.go @@ -12,7 +12,6 @@ import ( "github.com/containers/podman/v2/cmd/podman/utils" "github.com/containers/podman/v2/cmd/podman/validate" "github.com/containers/podman/v2/pkg/domain/entities" - "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -51,7 +50,7 @@ func prune(cmd *cobra.Command, args []string) error { fmt.Print("Are you sure you want to continue? [y/N] ") answer, err := reader.ReadString('\n') if err != nil { - return errors.Wrapf(err, "error reading input") + return err } if strings.ToLower(answer)[0] != 'y' { return nil |