diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-11 09:36:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-11 09:36:53 -0400 |
| commit | 8f0a53c974cdaebb4cb46e04e27d3c3204d225cd (patch) | |
| tree | 367b92ff985af8844043d8de5ce8c884a0b4ecea /pkg/domain | |
| parent | 397de44d487e25b5820777fcbab9728cf2af5e14 (diff) | |
| parent | 204493173e26fcb07362804142e3e722a657216e (diff) | |
| download | podman-8f0a53c974cdaebb4cb46e04e27d3c3204d225cd.tar.gz podman-8f0a53c974cdaebb4cb46e04e27d3c3204d225cd.tar.bz2 podman-8f0a53c974cdaebb4cb46e04e27d3c3204d225cd.zip | |
Merge pull request #7561 from vrothberg/fix-7340
remote run: fix error checks
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 062b38a70..35550b9be 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -19,6 +19,7 @@ import ( "github.com/containers/podman/v2/pkg/bindings" "github.com/containers/podman/v2/pkg/bindings/containers" "github.com/containers/podman/v2/pkg/domain/entities" + "github.com/containers/podman/v2/pkg/errorhandling" "github.com/containers/podman/v2/pkg/specgen" "github.com/pkg/errors" "github.com/sirupsen/logrus" @@ -537,8 +538,8 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta // de-spaghetti the code. defer func() { if err := containers.Remove(ic.ClientCxt, con.ID, bindings.PFalse, bindings.PTrue); err != nil { - if errors.Cause(err) == define.ErrNoSuchCtr || - errors.Cause(err) == define.ErrCtrRemoved { + if errorhandling.Contains(err, define.ErrNoSuchCtr) || + errorhandling.Contains(err, define.ErrCtrRemoved) { logrus.Warnf("Container %s does not exist: %v", con.ID, err) } else { logrus.Errorf("Error removing container %s: %v", con.ID, err) @@ -556,7 +557,7 @@ func (ic *ContainerEngine) ContainerRun(ctx context.Context, opts entities.Conta // Determine why the wait failed. If the container doesn't exist, // consult the events. - if !strings.Contains(waitErr.Error(), define.ErrNoSuchCtr.Error()) { + if !errorhandling.Contains(waitErr, define.ErrNoSuchCtr) { return &report, waitErr } |