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 /libpod/runtime_ctr.go | |
| 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 'libpod/runtime_ctr.go')
| -rw-r--r-- | libpod/runtime_ctr.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libpod/runtime_ctr.go b/libpod/runtime_ctr.go index 241448981..abb97293f 100644 --- a/libpod/runtime_ctr.go +++ b/libpod/runtime_ctr.go @@ -331,7 +331,7 @@ func (r *Runtime) setupContainer(ctx context.Context, ctr *Container) (_ *Contai ctr.config.ShmDir = filepath.Join(ctr.bundlePath(), "shm") if err := os.MkdirAll(ctr.config.ShmDir, 0700); err != nil { if !os.IsExist(err) { - return nil, errors.Wrapf(err, "unable to create shm %q dir", ctr.config.ShmDir) + return nil, errors.Wrap(err, "unable to create shm dir") } } ctr.config.Mounts = append(ctr.config.Mounts, ctr.config.ShmDir) @@ -620,7 +620,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol id, err := r.state.LookupContainerID(idOrName) if err != nil { - return "", errors.Wrapf(err, "Failed to find container %q in state", idOrName) + return "", errors.Wrapf(err, "failed to find container %q in state", idOrName) } // Begin by trying a normal removal. Valid containers will be removed normally. @@ -650,7 +650,7 @@ func (r *Runtime) evictContainer(ctx context.Context, idOrName string, removeVol return id, err } if !exists { - return id, errors.Wrapf(err, "Failed to find container ID %q for eviction", id) + return id, errors.Wrapf(err, "failed to find container ID %q for eviction", id) } // Re-create a container struct for removal purposes |