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 /pkg/domain/infra/abi/containers.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 'pkg/domain/infra/abi/containers.go')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index 8b0d53940..d92911e0c 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -312,7 +312,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string, reports = append(reports, &report) continue } - report.Err = errors.Wrapf(err, "Failed to evict container: %q", id) + report.Err = errors.Wrapf(err, "failed to evict container: %q", id) reports = append(reports, &report) continue } @@ -604,7 +604,7 @@ func checkExecPreserveFDs(options entities.ExecOptions) error { if options.PreserveFDs > 0 { entries, err := ioutil.ReadDir("/proc/self/fd") if err != nil { - return errors.Wrapf(err, "unable to read /proc/self/fd") + return err } m := make(map[int]bool) |