diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2020-10-05 12:33:53 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2020-10-05 15:30:37 -0700 |
| commit | 4878dff3e2c89382699c29c10dc5036367275575 (patch) | |
| tree | 5215fd4238ac12dc81af595d1ee3b174430769c5 /pkg/domain/infra/tunnel | |
| parent | 1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9 (diff) | |
| download | podman-4878dff3e2c89382699c29c10dc5036367275575.tar.gz podman-4878dff3e2c89382699c29c10dc5036367275575.tar.bz2 podman-4878dff3e2c89382699c29c10dc5036367275575.zip | |
Remove excessive error wrapping
In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like
fails, the error message already contains the file name and the
operation that fails, so there is no need to wrap the error with
something like "open %s failed".
While at it
- replace a few places with os.Open, ioutil.ReadAll with
ioutil.ReadFile.
- replace errors.Wrapf with errors.Wrap for cases where there
are no %-style arguments.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'pkg/domain/infra/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 194bb4b48..1bb4e68ac 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -84,7 +84,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin for _, cidFile := range options.CIDFiles { content, err := ioutil.ReadFile(cidFile) if err != nil { - return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile) + return nil, errors.Wrap(err, "error reading CIDFile") } id := strings.Split(string(content), "\n")[0] namesOrIds = append(namesOrIds, id) @@ -164,7 +164,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, for _, cidFile := range options.CIDFiles { content, err := ioutil.ReadFile(cidFile) if err != nil { - return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile) + return nil, errors.Wrap(err, "error reading CIDFile") } id := strings.Split(string(content), "\n")[0] namesOrIds = append(namesOrIds, id) |