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 /libpod/container_internal.go | |
| 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 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 0514fb46f..d64d3ab87 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -496,7 +496,7 @@ func (c *Container) setupStorage(ctx context.Context) error { artifacts := filepath.Join(c.config.StaticDir, artifactsDir) if err := os.MkdirAll(artifacts, 0755); err != nil { - return errors.Wrapf(err, "error creating artifacts directory %q", artifacts) + return errors.Wrap(err, "error creating artifacts directory") } return nil @@ -1820,7 +1820,7 @@ func (c *Container) appendStringToRundir(destFile, output string) (string, error f, err := os.OpenFile(destFileName, os.O_APPEND|os.O_WRONLY, 0600) if err != nil { - return "", errors.Wrapf(err, "unable to open %s", destFileName) + return "", err } defer f.Close() |